From 2a13b9b7db8b45950373dd6bf5bf8b91dfd8edd8 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 11 Oct 2012 07:03:21 -0700
Subject: [PATCH] Fix the '--load' logic.

---
 src/Application.cpp | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index fa8861fa1..11b19895b 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -208,17 +208,25 @@ void Application::startNewLedger()
 
 void Application::loadOldLedger()
 {
-	Ledger::pointer lastLedger = Ledger::getSQL("SELECT * from Ledgers order by LedgerSeq desc limit 1;");
-
-	if (!lastLedger)
+	try
 	{
-		std::cout << "No Ledger found?" << std::endl;
+		Ledger::pointer lastLedger = Ledger::getSQL("SELECT * from Ledgers order by LedgerSeq desc limit 1;");
+
+		if (!lastLedger)
+		{
+			std::cout << "No Ledger found?" << std::endl;
+			exit(-1);
+		}
+		lastLedger->setClosed();
+
+		Ledger::pointer openLedger = boost::make_shared<Ledger>(false, boost::ref(*lastLedger));
+		mMasterLedger.switchLedgers(lastLedger, openLedger);
+		mNetOps.setLastCloseTime(lastLedger->getCloseTimeNC());
+	}
+	catch (SHAMapMissingNode& mn)
+	{
+		Log(lsFATAL) << "Cannot load ledger. " << mn;
 		exit(-1);
 	}
-	lastLedger->setClosed();
-
-	Ledger::pointer openLedger = boost::make_shared<Ledger>(false, boost::ref(*lastLedger));
-	mMasterLedger.switchLedgers(lastLedger, openLedger);
-	mNetOps.setLastCloseTime(lastLedger->getCloseTimeNC());
 }
 // vim:ts=4