diff --git a/src/LedgerNode.cpp b/src/LedgerNode.cpp
index 1840e371ea..76bd2cc71b 100644
--- a/src/LedgerNode.cpp
+++ b/src/LedgerNode.cpp
@@ -1,9 +1,11 @@
 
 #include "Ledger.h"
-#include "utils.h"
 
 #include <boost/make_shared.hpp>
 
+#include "utils.h"
+#include "Log.h"
+
 LedgerStateParms Ledger::writeBack(LedgerStateParms parms, SerializedLedgerEntry::pointer entry)
 {
 	ScopedLock l(mAccountStateMap->Lock());
@@ -13,9 +15,7 @@ LedgerStateParms Ledger::writeBack(LedgerStateParms parms, SerializedLedgerEntry
 	{
 		if ((parms & lepCREATE) == 0)
 		{
-#ifdef DEBUG
-			std::cerr << "writeBack no create" << std::endl;
-#endif
+			Log(lsERROR) << "WriteBack non-existent node without create";
 			return lepMISSING;
 		}
 		create = true;
diff --git a/src/SHAMap.cpp b/src/SHAMap.cpp
index 125f7b5b6e..4bd830009e 100644
--- a/src/SHAMap.cpp
+++ b/src/SHAMap.cpp
@@ -1,4 +1,6 @@
 
+#include "SHAMap.h"
+
 #include <stack>
 
 #include <boost/foreach.hpp>
@@ -9,7 +11,7 @@
 
 #include "Serializer.h"
 #include "BitcoinUtil.h"
-#include "SHAMap.h"
+#include "Log.h"
 
 SHAMap::SHAMap(uint32 seq) : mSeq(seq), mState(Modifying)
 {
@@ -570,7 +572,11 @@ bool SHAMap::updateGiveItem(SHAMapItem::pointer item, bool isTransaction)
 
 	returnNode(node, true);
 	if (!node->setItem(item, isTransaction ? SHAMapTreeNode::tnTRANSACTION : SHAMapTreeNode::tnACCOUNT_STATE))
+	{
+		Log(lsFATAL) << "SHAMap setItem fails";
+		assert(false);
 		return false;
+	}
 
 	dirtyUp(stack, tag, node->getNodeHash());
 	return true;