fix potential seg fault when Client Context isn't handled correct with exceptions

1 files changed, 5 insertions, 5 deletions

diff --git a/db/client.cpp b/db/client.cpp
index 7445ecacb55..e4fd4b9dddc 100644
--- a/db/client.cpp
+++ b/db/client.cpp
@@ -169,11 +169,6 @@ namespace mongo {
             uassert( 13005 , "can't create db, keeps getting closed" , _db );
         }
 
-        _client->_context = this;
-        _client->_curOp->enter( this );
-        if ( doauth )
-            _auth( lockState );
-
         switch ( _client->_curOp->getOp() ) {
         case dbGetMore: // getMore's are special and should be handled else where
         case dbUpdate: // update & delete check shard version in instance.cpp, so don't check here as well
@@ -188,6 +183,11 @@ namespace mongo {
             }
         }
         }
+
+        _client->_context = this;
+        _client->_curOp->enter( this );
+        if ( doauth )
+            _auth( lockState );
     }
 
     void Client::Context::_auth( int lockState ) {