SERVER-21075 Don't segfault mongos at shutdown if it never finished initializing sharding

1 files changed, 6 insertions, 5 deletions

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 02a6a6f6857..7facf5e8477 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -438,11 +438,12 @@ void mongo::exitCleanly(ExitCode code) {
         }
 
         auto catalogMgr = grid.catalogManager(txn);
-        catalogMgr->shutDown(txn);
-
-        auto cursorManager = grid.getCursorManager();
-        cursorManager->killAllCursors();
-        cursorManager->reapZombieCursors();
+        if (catalogMgr) {
+            catalogMgr->shutDown(txn);
+            auto cursorManager = grid.getCursorManager();
+            cursorManager->killAllCursors();
+            cursorManager->reapZombieCursors();
+        }
     }
 
     mongo::dbexit(code);