diff --git a/src/TargetController/CommandManager.hpp b/src/TargetController/CommandManager.hpp
index c16c78ff..22fc347b 100644
--- a/src/TargetController/CommandManager.hpp
+++ b/src/TargetController/CommandManager.hpp
@@ -60,9 +60,11 @@ namespace Bloom::TargetController
                 return std::unique_ptr<SuccessResponseType>(
                     dynamic_cast<SuccessResponseType*>(response.release())
                 );
+
+            } else {
+                return std::move(response);
             }
 
-            return std::move(response);
         }
     };
 }