SERVER-18049 getShardMap command on MongoD should check if shard registry is initialized

1 files changed, 7 insertions, 1 deletions

diff --git a/src/mongo/s/client/shard.cpp b/src/mongo/s/client/shard.cpp
index 0a5be63b855..1daf5c27a34 100644
--- a/src/mongo/s/client/shard.cpp
+++ b/src/mongo/s/client/shard.cpp
@@ -81,7 +81,13 @@ namespace {
                          std::string& errmsg ,
                          mongo::BSONObjBuilder& result) {
 
-            grid.shardRegistry()->toBSON(&result);
+            // MongoD instances do not know that they are part of a sharded cluster until they
+            // receive a setShardVersion command and that's when the catalog manager and the shard
+            // registry get initialized.
+            if (grid.shardRegistry()) {
+                grid.shardRegistry()->toBSON(&result);
+            }
+
             return true;
         }