diff --git a/include/ipmid/message.hpp b/include/ipmid/message.hpp
index b10fc42..9bc1147 100644
--- a/include/ipmid/message.hpp
+++ b/include/ipmid/message.hpp
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <boost/asio/spawn.hpp>
 #include <cstdint>
+#include <exception>
 #include <ipmid/api-types.hpp>
 #include <ipmid/message/types.hpp>
 #include <memory>
@@ -110,7 +111,8 @@
     ~Payload()
     {
         using namespace phosphor::logging;
-        if (raw.size() != 0 && !trailingOk && !unpackCheck && !unpackError)
+        if (raw.size() != 0 && std::uncaught_exceptions() == 0 && !trailingOk &&
+            !unpackCheck && !unpackError)
         {
             log<level::ERR>("Failed to check request for full unpack");
         }