Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r033c6c0593bb66a5fcea0bbf16d4165071fa6476 -r150102801fd887fe60097f04b50614ebf67e7b07
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 033c6c0593bb66a5fcea0bbf16d4165071fa6476)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 150102801fd887fe60097f04b50614ebf67e7b07)
@@ -592,7 +592,7 @@
 
         private static bool CloseFailureMechanismResultViewForData(PipingFailureMechanismResultView view, object dataToCloseFor)
         {
-            PipingFailureMechanism failureMechanism = null;
+            var failureMechanism = dataToCloseFor as PipingFailureMechanism;
 
             if (dataToCloseFor is IAssessmentSection assessmentSection)
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r150102801fd887fe60097f04b50614ebf67e7b07
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 150102801fd887fe60097f04b50614ebf67e7b07)
@@ -182,6 +182,47 @@
         }
 
         [Test]
+        public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var failureMechanism = new PipingFailureMechanism();
+
+            using (var view = new PipingFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, failureMechanism);
+
+                // Assert
+                Assert.IsTrue(closeForData);
+            }
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var failureMechanism = new PipingFailureMechanism();
+            using (var view = new PipingFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, new PipingFailureMechanism());
+
+                // Assert
+                Assert.IsFalse(closeForData);
+            }
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void CloseForData_ViewCorrespondingToRemovedFailurePathContext_ReturnsTrue()
         {
             // Setup