SERVER-15471 improve GhostSync::associateSlave() error message

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index 739b7f1b194..483f872ce83 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -427,7 +427,7 @@ namespace mongo {
 
         _handshake = b.obj();
 
-        if (!theReplSet || !o.hasField("member")) {
+        if (!theReplSet || !o.hasField("member") || !o["member"].isNumber()) {
             return false;
         }
 
diff --git a/src/mongo/db/repl/rs_sync.cpp b/src/mongo/db/repl/rs_sync.cpp
index 45fdb0a6ec9..08eb9de9a2e 100644
--- a/src/mongo/db/repl/rs_sync.cpp
+++ b/src/mongo/db/repl/rs_sync.cpp
@@ -873,7 +873,7 @@ namespace replset {
         }
         else {
             log() << "replset couldn't find a slave with id " << memberId
-                  << ", not tracking " << rid << rsLog;
+                  << " in the current config, not tracking this node" << rsLog;
         }
     }