diff --git a/include/ipmid/message.hpp b/include/ipmid/message.hpp
index 92a0c25..7841e9e 100644
--- a/include/ipmid/message.hpp
+++ b/include/ipmid/message.hpp
@@ -601,18 +601,20 @@
     int unpack(Args&&... args)
     {
         int unpackRet = payload.unpack(std::forward<Args>(args)...);
-        if (unpackRet == ipmi::ccSuccess)
+        if (unpackRet != ipmi::ccSuccess)
         {
-            if (!payload.trailingOk)
+            // not all bits were consumed by requested parameters
+            return ipmi::ccReqDataLenInvalid;
+        }
+        if (!payload.trailingOk)
+        {
+            if (!payload.fullyUnpacked())
             {
-                if (!payload.fullyUnpacked())
-                {
-                    // not all bits were consumed by requested parameters
-                    return ipmi::ccReqDataLenInvalid;
-                }
+                // not all bits were consumed by requested parameters
+                return ipmi::ccReqDataLenInvalid;
             }
         }
-        return unpackRet;
+        return ipmi::ccSuccess;
     }
 
     /**