diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index 5094882864..4440d20309 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -894,11 +894,14 @@ public:
         m_journal.info << "Received shutdown request";
         stop (m_journal);
         m_journal.info << "Done.";
-        exitWithCode(0);
+        StopSustain();
     }
 
-    void exitWithCode(int code){
+    void exitWithCode(int code)
+    {
         StopSustain();
+        // VFALCO This breaks invariants: automatic objects
+        //        will not have destructors called.
         std::exit(code);
     }