diff --git a/.clang-tidy b/.clang-tidy
index 0d22df7..32f7f75 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -3,12 +3,14 @@
 boost-use-to-string,
 bugprone-argument-comment,
 bugprone-assert-side-effect,
+bugprone-assignment-in-if-condition,
 bugprone-bad-signal-to-kill-thread,
 bugprone-bool-pointer-implicit-conversion,
 bugprone-branch-clone,
 bugprone-copy-constructor-init,
 bugprone-dangling-handle,
 bugprone-dynamic-static-initializers,
+bugprone-exception-escape,
 bugprone-fold-init-type,
 bugprone-forward-declaration-namespace,
 bugprone-forwarding-reference-overload,
@@ -32,18 +34,23 @@
 bugprone-posix-return,
 bugprone-redundant-branch-condition,
 bugprone-reserved-identifier,
+bugprone-shared-ptr-array-mismatch,
 bugprone-signal-handler,
 bugprone-signed-char-misuse,
 bugprone-sizeof-container,
 bugprone-sizeof-expression,
 bugprone-spuriously-wake-up-functions,
+bugprone-standalone-empty,
 bugprone-string-constructor,
 bugprone-string-integer-assignment,
 bugprone-string-literal-with-embedded-nul,
+bugprone-stringview-nullptr,
 bugprone-suspicious-enum-usage,
 bugprone-suspicious-include,
+bugprone-suspicious-memory-comparison,
 bugprone-suspicious-memset-usage,
 bugprone-suspicious-missing-comma,
+bugprone-suspicious-realloc-usage,
 bugprone-suspicious-semicolon,
 bugprone-suspicious-string-compare,
 bugprone-swapped-arguments,
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);