Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r8401b29317ea18926f01839e1bec6284a618d6fe -r351b00f0c30e2e39c4eb973273a8d75ed9e740da
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 8401b29317ea18926f01839e1bec6284a618d6fe)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 351b00f0c30e2e39c4eb973273a8d75ed9e740da)
@@ -411,7 +411,7 @@
 
         private static bool CloseScenariosViewForData(GrassCoverErosionInwardsScenariosView view, object dataToCloseFor)
         {
-            GrassCoverErosionInwardsFailureMechanism failureMechanism = null;
+            var failureMechanism = dataToCloseFor as GrassCoverErosionInwardsFailureMechanism;
 
             if (dataToCloseFor is FailureMechanismContext<GrassCoverErosionInwardsFailureMechanism> failureMechanismContext)
             {
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d -r351b00f0c30e2e39c4eb973273a8d75ed9e740da
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs	(.../GrassCoverErosionInwardsScenariosViewInfoTest.cs)	(revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs	(.../GrassCoverErosionInwardsScenariosViewInfoTest.cs)	(revision 351b00f0c30e2e39c4eb973273a8d75ed9e740da)
@@ -178,6 +178,36 @@
         }
 
         [Test]
+        public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnFalse()
+        {
+            // Setup
+            using (var view = new GrassCoverErosionInwardsScenariosView(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism()))
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, new GrassCoverErosionInwardsFailureMechanism());
+
+                // Assert
+                Assert.IsFalse(closeForData);
+            }
+        }
+
+        [Test]
+        public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnTrue()
+        {
+            // Setup
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+
+            using (var view = new GrassCoverErosionInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism))
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, failureMechanism);
+
+                // Assert
+                Assert.IsTrue(closeForData);
+            }
+        }
+
+        [Test]
         public void CloseForData_ViewNotCorrespondingToRemovedFailurePathContext_ReturnFalse()
         {
             // Setup