Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r6f08c10d29c1338113ab7c2c5eb19d6f2aa0fd30 -r460b7d87d2e342b75b6ba1ff1d43eff1e7bac841
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 6f08c10d29c1338113ab7c2c5eb19d6f2aa0fd30)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 460b7d87d2e342b75b6ba1ff1d43eff1e7bac841)
@@ -318,7 +318,7 @@
 
         private static bool CloseScenariosViewForData(StabilityPointStructuresScenariosView view, object dataToCloseFor)
         {
-            StabilityPointStructuresFailureMechanism failureMechanism = null;
+            var failureMechanism = dataToCloseFor as StabilityPointStructuresFailureMechanism;
 
             if (dataToCloseFor is IAssessmentSection assessmentSection)
             {
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresScenariosViewInfoTest.cs
===================================================================
diff -u -r1e4347e093b35932959278ca9560bbcd815d722e -r460b7d87d2e342b75b6ba1ff1d43eff1e7bac841
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresScenariosViewInfoTest.cs	(.../StabilityPointStructuresScenariosViewInfoTest.cs)	(revision 1e4347e093b35932959278ca9560bbcd815d722e)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresScenariosViewInfoTest.cs	(.../StabilityPointStructuresScenariosViewInfoTest.cs)	(revision 460b7d87d2e342b75b6ba1ff1d43eff1e7bac841)
@@ -157,6 +157,35 @@
         }
 
         [Test]
+        public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnFalse()
+        {
+            using (var view = new StabilityPointStructuresScenariosView(new CalculationGroup(), new StabilityPointStructuresFailureMechanism()))
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, new StabilityPointStructuresFailureMechanism());
+
+                // Assert
+                Assert.IsFalse(closeForData);
+            }
+        }
+
+        [Test]
+        public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnTrue()
+        {
+            // Setup
+            var correspondingFailureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            using (var view = new StabilityPointStructuresScenariosView(correspondingFailureMechanism.CalculationsGroup, correspondingFailureMechanism))
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, correspondingFailureMechanism);
+
+                // Assert
+                Assert.IsTrue(closeForData);
+            }
+        }
+
+        [Test]
         public void CloseForData_AssessmentSectionRemovedWithoutStabilityPointStructuresFailureMechanism_ReturnFalse()
         {
             // Setup