Merge branch 'upstream/2.0.2'

1 files changed, 4 insertions, 1 deletions

diff --git a/s/d_logic.cpp b/s/d_logic.cpp
index 9d4fd74..fd281ac 100644
--- a/s/d_logic.cpp
+++ b/s/d_logic.cpp
@@ -107,7 +107,10 @@ namespace mongo {
         b.append( "connectionId" , cc().getConnectionId() );
         b.append( "instanceIdent" , prettyHostName() );
         b.appendTimestamp( "version" , shardingState.getVersion( ns ) );
-        b.appendTimestamp( "yourVersion" , ShardedConnectionInfo::get( true )->getVersion( ns ) );
+        
+        ShardedConnectionInfo* info = ShardedConnectionInfo::get( false );
+        b.appendTimestamp( "yourVersion" , info ? info->getVersion(ns) : (ConfigVersion)0 );
+
         b.appendBinData( "msg" , m.header()->len , bdtCustom , (char*)(m.singleData()) );
         LOG(2) << "writing back msg with len: " << m.header()->len << " op: " << m.operation() << endl;
         writeBackManager.queueWriteBack( clientID.str() , b.obj() );