fix m/r when a sharded connection for a non-sharded collection

1 files changed, 5 insertions, 2 deletions

diff --git a/db/commands/mr.cpp b/db/commands/mr.cpp
index 1e4cc3b553f..834d6f64cf0 100644
--- a/db/commands/mr.cpp
+++ b/db/commands/mr.cpp
@@ -725,8 +725,11 @@ namespace mongo {
                         Client::Context ctx( config.ns );
                         
                         ShardChunkManager::Snapshot chunkSnapshot;
-                        if ( shardingState.needShardChunkManager( config.ns ) ) 
-                            chunkSnapshot = shardingState.getShardChunkManager( config.ns )->snapshot();
+                        if ( shardingState.needShardChunkManager( config.ns ) ) {
+                            ShardChunkManagerPtr p = shardingState.getShardChunkManager( config.ns );
+                            if ( p )
+                                chunkSnapshot = p->snapshot();
+                        }
                         
                         shared_ptr<Cursor> temp = bestGuessCursor( config.ns.c_str(), config.filter, config.sort );
                         auto_ptr<ClientCursor> cursor( new ClientCursor( QueryOption_NoCursorTimeout , temp , config.ns.c_str() ) );