Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs
===================================================================
diff -u -ra2b11ecd56c2050d6a1f5272c5294e2eb0bf69ee -r03690ef8898b8ab4b481f156bccff8b32deac912
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision a2b11ecd56c2050d6a1f5272c5294e2eb0bf69ee)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision 03690ef8898b8ab4b481f156bccff8b32deac912)
@@ -150,11 +150,7 @@
             NormType normativeNormType = assessmentSection.FailureMechanismContribution.NormativeNorm;
             IEnumerable<HydraulicBoundaryLocationCalculation> calculationsToClear = GetHydraulicBoundaryLocationCalculationsToClear(normativeNorm, normativeNormType);
 
-            NormType normType = normativeNorm
-                                    ? normativeNormType
-                                    : normativeNormType == NormType.LowerLimit
-                                        ? NormType.Signaling
-                                        : NormType.LowerLimit;
+            NormType normType = GetNormType(normativeNorm, normativeNormType);
 
             var affectedObjects = new List<IObservable>();
             affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(calculationsToClear));
@@ -168,6 +164,18 @@
             return affectedObjects;
         }
 
+        private static NormType GetNormType(bool normativeNorm, NormType normativeNormType)
+        {
+            if (normativeNorm)
+            {
+                return normativeNormType;
+            }
+
+            return normativeNormType == NormType.LowerLimit
+                       ? NormType.Signaling
+                       : NormType.LowerLimit;
+        }
+
         private IEnumerable<HydraulicBoundaryLocationCalculation> GetHydraulicBoundaryLocationCalculationsToClear(bool normativeNorm, NormType normativeNormType)
         {
             if (normativeNorm)