diff --git a/chassishandler.cpp b/chassishandler.cpp
index 4b42b3c..7b94189 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -1658,15 +1658,15 @@
         return IPMI_CC_REQ_DATA_LEN_INVALID;
     }
 
-    reqPolicy = *reqptr & power_policy::policyBitMask;
-    if (reqPolicy > power_policy::noChange)
+    if (*reqptr > power_policy::noChange)
     {
         phosphor::logging::log<level::ERR>("Reserved request parameter",
-                                           entry("REQ=0x%x", reqPolicy));
+                                           entry("REQ=0x%x", *reqptr));
         *data_len = 0;
-        return IPMI_CC_PARM_NOT_SUPPORTED;
+        return IPMI_CC_PARM_OUT_OF_RANGE;
     }
 
+    reqPolicy = *reqptr & power_policy::policyBitMask;
     if (reqPolicy == power_policy::noChange)
     {
         // just return the supported policy
@@ -1717,6 +1717,7 @@
         return IPMI_CC_UNSPECIFIED_ERROR;
     }
 
+    *resptr = power_policy::allSupport;
     *data_len = power_policy::setPolicyReqLen;
     return IPMI_CC_OK;
 }