diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp
index c85da1531a67a0..a48db7c697e375 100644
--- a/src/app/CommandHandler.cpp
+++ b/src/app/CommandHandler.cpp
@@ -171,9 +171,8 @@ CHIP_ERROR CommandHandler::ValidateInvokeRequestMessageAndBuildRegistry(InvokeRe
     {
         err = CHIP_NO_ERROR;
     }
-    ReturnErrorOnFailure(invokeRequestMessage.ExitContainer());
-
-    return err;
+    ReturnErrorOnFailure(err);
+    return invokeRequestMessage.ExitContainer();
 }
 
 Status CommandHandler::ProcessInvokeRequest(System::PacketBufferHandle && payload, bool isTimedInvoke)