diff --git a/include/ipmid/handler.hpp b/include/ipmid/handler.hpp
index ebeb442..c84bffd 100644
--- a/include/ipmid/handler.hpp
+++ b/include/ipmid/handler.hpp
@@ -179,45 +179,47 @@
          * parameter selector. All the remaining data can be extracted using
          * the Payload class and the unpack API available to the Payload class.
          */
-        std::optional<InputArgsType> inputArgs;
-        if constexpr (std::tuple_size<InputArgsType>::value > 0)
-        {
-            if constexpr (std::is_same<std::tuple_element_t<0, InputArgsType>,
-                                       boost::asio::yield_context>::value)
-            {
-                inputArgs.emplace(std::tuple_cat(
-                    std::forward_as_tuple(*(request->ctx->yield)),
-                    std::move(unpackArgs)));
-            }
-            else if constexpr (std::is_same<
-                                   std::tuple_element_t<0, InputArgsType>,
-                                   ipmi::Context::ptr>::value)
-            {
-                inputArgs.emplace(
-                    std::tuple_cat(std::forward_as_tuple(request->ctx),
-                                   std::move(unpackArgs)));
-            }
-            else if constexpr (std::is_same<
-                                   std::tuple_element_t<0, InputArgsType>,
-                                   ipmi::message::Request::ptr>::value)
-            {
-                inputArgs.emplace(std::tuple_cat(std::forward_as_tuple(request),
-                                                 std::move(unpackArgs)));
-            }
-            else
-            {
-                // no special parameters were requested (but others were)
-                inputArgs.emplace(std::move(unpackArgs));
-            }
-        }
-        else
-        {
-            // no parameters were requested
-            inputArgs = std::move(unpackArgs);
-        }
         ResultType result;
         try
         {
+            std::optional<InputArgsType> inputArgs;
+            if constexpr (std::tuple_size<InputArgsType>::value > 0)
+            {
+                if constexpr (std::is_same<
+                                  std::tuple_element_t<0, InputArgsType>,
+                                  boost::asio::yield_context>::value)
+                {
+                    inputArgs.emplace(std::tuple_cat(
+                        std::forward_as_tuple(*(request->ctx->yield)),
+                        std::move(unpackArgs)));
+                }
+                else if constexpr (std::is_same<
+                                       std::tuple_element_t<0, InputArgsType>,
+                                       ipmi::Context::ptr>::value)
+                {
+                    inputArgs.emplace(
+                        std::tuple_cat(std::forward_as_tuple(request->ctx),
+                                       std::move(unpackArgs)));
+                }
+                else if constexpr (std::is_same<
+                                       std::tuple_element_t<0, InputArgsType>,
+                                       ipmi::message::Request::ptr>::value)
+                {
+                    inputArgs.emplace(std::tuple_cat(
+                        std::forward_as_tuple(request), std::move(unpackArgs)));
+                }
+                else
+                {
+                    // no special parameters were requested (but others were)
+                    inputArgs.emplace(std::move(unpackArgs));
+                }
+            }
+            else
+            {
+                // no parameters were requested
+                inputArgs = std::move(unpackArgs);
+            }
+
             // execute the registered callback function and get the
             // ipmi::RspType<>
             result = std::apply(handler_, *inputArgs);