Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -re0e813ab11c3b35020a785cebf275366cd2eaf9d -rf04895089d34bddb618db8c7001c574428be10c6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision e0e813ab11c3b35020a785cebf275366cd2eaf9d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision f04895089d34bddb618db8c7001c574428be10c6)
@@ -210,6 +210,33 @@
         }
 
         [Test]
+        public void Data_SetToNull_MapDataCleared()
+        {
+            // Setup
+            using (var view = new PipingFailureMechanismView())
+            {
+                var mocks = new MockRepository();
+                var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+                mocks.ReplayAll();
+
+                var pipingFailureMechanism = new PipingFailureMechanism();
+                var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock);
+
+                view.Data = pipingContext;
+
+                // Precondition
+                Assert.AreEqual(7, view.Map.Data.List.Count);
+
+                // Call
+                view.Data = null;
+
+                // Assert
+                Assert.IsNull(view.Data);
+                Assert.IsNull(view.Map.Data);
+            }
+        }
+
+        [Test]
         public void UpdateObserver_HydraulicBoundaryDatabaseUpdated_SetNewMapData()
         {
             // Setup