1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index c10d0a3174b..5bbf3339a37 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -206,14 +206,15 @@ void receivedCommand(OperationContext* txn,
 
     const int32_t responseToMsgId = message.header().getId();
 
-    DbMessage dbMessage(message);
-    QueryMessage queryMessage(dbMessage);
-
     CurOp* op = CurOp::get(txn);
-
     rpc::LegacyReplyBuilder builder{};
 
     try {
+        DbMessage dbMessage(message);
+
+        // Can throw, so make sure it's under the try statement.
+        QueryMessage queryMessage(dbMessage);
+
         // This will throw if the request is on an invalid namespace.
         rpc::LegacyRequest request{&message};
         // Auth checking for Commands happens later.