SERVER-33542 Avoid swallowing error codes from PlanExecutor errors

1 files changed, 3 insertions, 9 deletions

diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp
index 9757e8e450d..da0f6bfc9a8 100644
--- a/src/mongo/db/commands/find_and_modify.cpp
+++ b/src/mongo/db/commands/find_and_modify.cpp
@@ -120,15 +120,9 @@ boost::optional<BSONObj> advanceExecutor(OperationContext* opCtx,
         error() << "Plan executor error during findAndModify: " << PlanExecutor::statestr(state)
                 << ", stats: " << redact(Explain::getWinningPlanStats(exec));
 
-        if (WorkingSetCommon::isValidStatusMemberObject(value)) {
-            uassertStatusOK(WorkingSetCommon::getMemberObjectStatus(value));
-            MONGO_UNREACHABLE;
-        }
-
-        uasserted(ErrorCodes::OperationFailed,
-                  str::stream() << "executor returned " << PlanExecutor::statestr(state)
-                                << " while executing "
-                                << (isRemove ? "delete" : "update"));
+        uassertStatusOKWithContext(WorkingSetCommon::getMemberObjectStatus(value),
+                                   "Plan executor error during findAndModify");
+        MONGO_UNREACHABLE;
     }
 
     invariant(state == PlanExecutor::IS_EOF);