diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp
index 33e3bde..cd1b60f 100644
--- a/redfish-core/lib/trigger.hpp
+++ b/redfish-core/lib/trigger.hpp
@@ -606,7 +606,8 @@
 
     if (metricType)
     {
-        if (!(ctx.metricType = getMetricType(*metricType)))
+        ctx.metricType = getMetricType(*metricType);
+        if (!ctx.metricType)
         {
             messages::propertyValueIncorrect(res, "MetricType", *metricType);
             return false;
@@ -615,8 +616,8 @@
 
     if (discreteTriggerCondition)
     {
-        if (!(ctx.discreteCondition =
-                  getDiscreteCondition(*discreteTriggerCondition)))
+        ctx.discreteCondition = getDiscreteCondition(*discreteTriggerCondition);
+        if (!ctx.discreteCondition)
         {
             messages::propertyValueIncorrect(res, "DiscreteTriggerCondition",
                                              *discreteTriggerCondition);