Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs
===================================================================
diff -u -r976b9242f7fa5c88c176c86544091059027d05f2 -ra2b11ecd56c2050d6a1f5272c5294e2eb0bf69ee
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision 976b9242f7fa5c88c176c86544091059027d05f2)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision a2b11ecd56c2050d6a1f5272c5294e2eb0bf69ee)
@@ -170,13 +170,16 @@
 
         private IEnumerable<HydraulicBoundaryLocationCalculation> GetHydraulicBoundaryLocationCalculationsToClear(bool normativeNorm, NormType normativeNormType)
         {
-            return normativeNorm
-                       ? normativeNormType == NormType.LowerLimit
-                             ? assessmentSection.WaterLevelCalculationsForLowerLimitNorm
-                             : assessmentSection.WaterLevelCalculationsForSignalingNorm
-                       : normativeNormType == NormType.LowerLimit
-                           ? assessmentSection.WaterLevelCalculationsForSignalingNorm
-                           : assessmentSection.WaterLevelCalculationsForLowerLimitNorm;
+            if (normativeNorm)
+            {
+                return normativeNormType == NormType.LowerLimit
+                           ? assessmentSection.WaterLevelCalculationsForLowerLimitNorm
+                           : assessmentSection.WaterLevelCalculationsForSignalingNorm;
+            }
+
+            return normativeNormType == NormType.LowerLimit
+                       ? assessmentSection.WaterLevelCalculationsForSignalingNorm
+                       : assessmentSection.WaterLevelCalculationsForLowerLimitNorm;
         }
     }
 }
\ No newline at end of file