diff --git a/src/core/net/icmp6.cpp b/src/core/net/icmp6.cpp
index 3cbd81e60..168d76124 100644
--- a/src/core/net/icmp6.cpp
+++ b/src/core/net/icmp6.cpp
@@ -215,7 +215,7 @@ ThreadError Icmp::HandleEchoRequest(Message &aRequestMessage, const MessageInfo
     }
 
     payloadLength = aRequestMessage.GetLength() - aRequestMessage.GetOffset() - IcmpHeader::GetDataOffset();
-    SuccessOrExit(replyMessage->SetLength(IcmpHeader::GetDataOffset() + payloadLength));
+    SuccessOrExit(error = replyMessage->SetLength(IcmpHeader::GetDataOffset() + payloadLength));
 
     replyMessage->Write(0, IcmpHeader::GetDataOffset(), &icmp6Header);
     aRequestMessage.CopyTo(aRequestMessage.GetOffset() + IcmpHeader::GetDataOffset(),
diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index 09a97d3fd..d40324ac4 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -1432,7 +1432,7 @@ ThreadError Mle::SendMessage(Message &aMessage, const Ip6::Address &aDestination
 
         tagLength = sizeof(tag);
         aesCcm.Finalize(tag, &tagLength);
-        SuccessOrExit(aMessage.Append(tag, tagLength));
+        SuccessOrExit(error = aMessage.Append(tag, tagLength));
 
         mKeyManager.IncrementMleFrameCounter();
     }