Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs
===================================================================
diff -u -rb1ca9c60bb8dd87c4820d73fa59ab095edb91892 -re3525b83462e23f26b9220c00667bd3eb11d33ed
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs	(.../FailureMechanismView.cs)	(revision b1ca9c60bb8dd87c4820d73fa59ab095edb91892)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs	(.../FailureMechanismView.cs)	(revision e3525b83462e23f26b9220c00667bd3eb11d33ed)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Components.Gis.Data;
@@ -43,6 +44,7 @@
         private readonly MapPointData sectionsStartPointMapData;
         private readonly MapPointData sectionsEndPointMapData;
         private readonly MapPointData hydraulicBoundaryLocationsMapData;
+
         private Observer failureMechanismObserver;
         private Observer assessmentSectionObserver;
         private Observer hydraulicBoundaryLocationsObserver;
@@ -60,7 +62,7 @@
         /// Creates a new instance of <see cref="FailureMechanismView{T}"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to show the data for.</param>
-        /// <param name="assessmentSection">The assessment section to show data for.</param>
+        /// <param name="assessmentSection">The assessment section to show the data for.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public FailureMechanismView(T failureMechanism, IAssessmentSection assessmentSection)
         {
@@ -94,7 +96,7 @@
             mapDataCollection.Add(sectionsEndPointMapData);
             mapDataCollection.Add(hydraulicBoundaryLocationsMapData);
 
-            SetAllMappDataFeatures();
+            SetAllMapDataFeatures();
             ringtoetsMapControl.SetAllData(mapDataCollection, assessmentSection.BackgroundData);
         }
 
@@ -173,7 +175,7 @@
                 AssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
         }
 
-        private void SetAllMappDataFeatures()
+        private void SetAllMapDataFeatures()
         {
             SetReferenceLineMapData();
             SetSectionsMapData();
@@ -208,7 +210,7 @@
 
         private void SetSectionsMapData()
         {
-            IEnumerable<FailureMechanismSection> failureMechanismSections = FailureMechanism.Sections;
+            IEnumerable<FailureMechanismSection> failureMechanismSections = FailureMechanism.Sections.ToArray();
 
             sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections);
             sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs
===================================================================
diff -u -rf6e74516582b0e5c854526d50a90db1216417d9d -re3525b83462e23f26b9220c00667bd3eb11d33ed
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision f6e74516582b0e5c854526d50a90db1216417d9d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision e3525b83462e23f26b9220c00667bd3eb11d33ed)
@@ -73,7 +73,7 @@
         }
 
         [Test]
-        public void Constructor_failureMechanismNull_ThrowsArgumentNullException()
+        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismViewInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -re3525b83462e23f26b9220c00667bd3eb11d33ed
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismViewInfoTest.cs	(.../FailureMechanismViewInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismViewInfoTest.cs	(.../FailureMechanismViewInfoTest.cs)	(revision e3525b83462e23f26b9220c00667bd3eb11d33ed)
@@ -209,6 +209,10 @@
 
             // Assert
             Assert.IsInstanceOf<FailureMechanismView<IFailureMechanism>>(view);
+
+            var failureMechanismView = (FailureMechanismView<IFailureMechanism>) view;
+            Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
+            Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
 
         private class TestFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>