SERVER-15854 Don't massert when checking for deleted shard

1 files changed, 5 insertions, 3 deletions

diff --git a/src/mongo/s/commands/cluster_remove_shard_cmd.cpp b/src/mongo/s/commands/cluster_remove_shard_cmd.cpp
index d93a8152a88..4e38a7bc9ac 100644
--- a/src/mongo/s/commands/cluster_remove_shard_cmd.cpp
+++ b/src/mongo/s/commands/cluster_remove_shard_cmd.cpp
@@ -100,9 +100,11 @@ namespace {
 
             const string target = cmdObj.firstElement().valuestrsafe();
 
-            Shard s = Shard::make(target);
-            if (!grid.knowAboutShard(s.getConnString())) {
-                errmsg = "unknown shard";
+            Shard s = Shard::findIfExists(target);
+            if (s == Shard::EMPTY) {
+                errmsg = str::stream() << "shard '" << target << "'"
+                                       << " does not exist";
+                log() << errmsg;
                 return false;
             }