diff --git a/src/cpp/ripple/ripple_Application.cpp b/src/cpp/ripple/ripple_Application.cpp
index b406a7197a..fe768f4a2e 100644
--- a/src/cpp/ripple/ripple_Application.cpp
+++ b/src/cpp/ripple/ripple_Application.cpp
@@ -8,7 +8,8 @@
 volatile bool doShutdown = false;
 
 // VFALCO TODO Wrap this up in something neater.
-IApplication* theApp = nullptr;
+//IApplication* theApp = nullptr;
+ScopedPointer <IApplication> theApp;
 
 class Application;
 
@@ -461,7 +462,7 @@ void Application::setup ()
     {
         theApp->getHashNodeDB ()->getDB ()->executeSQL (boost::str (boost::format ("PRAGMA cache_size=-%d;") %
                 (theConfig.getSize (siHashNodeDBCache) * 1024)));
-	theApp->getHashNodeDB ()->getDB ()->setupCheckpointing (&mJobQueue);
+	    theApp->getHashNodeDB ()->getDB ()->setupCheckpointing (&mJobQueue);
     }
 
     theApp->getLedgerDB ()->getDB ()->executeSQL (boost::str (boost::format ("PRAGMA cache_size=-%d;") %
@@ -994,3 +995,4 @@ IApplication* IApplication::New ()
 {
     return new Application;
 }
+
diff --git a/src/cpp/ripple/ripple_IApplication.h b/src/cpp/ripple/ripple_IApplication.h
index 7ed252969e..f09902bf4e 100644
--- a/src/cpp/ripple/ripple_IApplication.h
+++ b/src/cpp/ripple/ripple_IApplication.h
@@ -104,6 +104,6 @@ public:
     virtual void sweep () = 0;
 };
 
-extern IApplication* theApp;
+extern ScopedPointer <IApplication> theApp;
 
 #endif