Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r9b82ed0cf3ec503d05ac1e21243e9c1e1177b9b2 -rf04895089d34bddb618db8c7001c574428be10c6
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 9b82ed0cf3ec503d05ac1e21243e9c1e1177b9b2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision f04895089d34bddb618db8c7001c574428be10c6)
@@ -67,6 +67,13 @@
 
                 DetachFromData();
                 data = newValue;
+
+                if (data == null)
+                {
+                    Map.ResetMapData();
+                    return;
+                }
+
                 SetDataToMap();
                 AttachToData();
             }