diff --git a/src/cpp/ripple/OrderBookDB.cpp b/src/cpp/ripple/OrderBookDB.cpp
index 732b52904f..3b6de21356 100644
--- a/src/cpp/ripple/OrderBookDB.cpp
+++ b/src/cpp/ripple/OrderBookDB.cpp
@@ -40,27 +40,24 @@ void OrderBookDB::setup(Ledger::ref ledger)
 	while (currentIndex.isNonZero())
 	{
 		SLE::pointer entry = ledger->getSLEi(currentIndex);
-		if (entry)
+		OrderBook::pointer book = OrderBook::newOrderBook(entry);
+		if (book)
 		{
-			OrderBook::pointer book = OrderBook::newOrderBook(entry);
-			if (book)
+			cLog(lsTRACE) << "OrderBookDB: found book";
+
+			if (mKnownMap.find(book->getBookBase()) == mKnownMap.end())
 			{
-				cLog(lsTRACE) << "OrderBookDB: found book";
+				mKnownMap[book->getBookBase()] = true;
 
-				if (mKnownMap.find(book->getBookBase()) == mKnownMap.end())
-				{
-					mKnownMap[book->getBookBase()] = true;
+				cLog(lsTRACE) << "OrderBookDB: unknown book in: "
+					<< STAmount::createHumanCurrency(book->getCurrencyIn())
+					<< " -> "
+					<< STAmount::createHumanCurrency(book->getCurrencyOut());
 
-					cLog(lsTRACE) << "OrderBookDB: unknown book in: "
-						<< STAmount::createHumanCurrency(book->getCurrencyIn())
-						<< " -> "
-						<< STAmount::createHumanCurrency(book->getCurrencyOut());
-
-					if (!book->getCurrencyIn())			// XRP
-						mXRPOrders.push_back(book);
-					else
-						mIssuerMap[book->getIssuerIn()].push_back(book);
-				}
+				if (!book->getCurrencyIn())			// XRP
+					mXRPOrders.push_back(book);
+				else
+					mIssuerMap[book->getIssuerIn()].push_back(book);
 			}
 		}