diff --git a/src/ripple/sitefiles/impl/Manager.cpp b/src/ripple/sitefiles/impl/Manager.cpp
index 43b9de02f..5e3a0d1b7 100644
--- a/src/ripple/sitefiles/impl/Manager.cpp
+++ b/src/ripple/sitefiles/impl/Manager.cpp
@@ -38,7 +38,7 @@ public:
 
     ManagerImp (Stoppable& stoppable, Journal journal)
         : Manager (stoppable)
-        , Thread ("PeerFinder")
+        , Thread ("SiteFiles")
         , m_logic (journal)
         , m_journal (journal)
     {
diff --git a/src/ripple_app/main/RippleMain.cpp b/src/ripple_app/main/RippleMain.cpp
index 3b5560bf3..62a702a7b 100644
--- a/src/ripple_app/main/RippleMain.cpp
+++ b/src/ripple_app/main/RippleMain.cpp
@@ -160,6 +160,11 @@ public:
         setAssertOnFailure (false);
     }
 
+    ~RippleUnitTests ()
+    {
+        m_app = nullptr;
+    }
+
     void logMessage (String const& message)
     {
         if (m_shouldLog)