return correctly from function

1 files changed, 7 insertions, 1 deletions

diff --git a/db/queryoptimizer.cpp b/db/queryoptimizer.cpp
index 0a6067bbc43..3d4cbd092d5 100644
--- a/db/queryoptimizer.cpp
+++ b/db/queryoptimizer.cpp
@@ -618,7 +618,13 @@ namespace mongo {
     }
 
     bool QueryPlanSet::Runner::prepareToYield( QueryOp &op ) {
-        GUARD_OP_EXCEPTION( op, if ( !op.error() ) { return op.prepareToYield(); } );
+        GUARD_OP_EXCEPTION( op,
+                           if ( op.error() ) {
+                               return true;
+                           } else {
+                               return op.prepareToYield();
+                           } );
+        return true;
     }
 
     void QueryPlanSet::Runner::recoverFromYield( QueryOp &op ) {