Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r48e25b3492e67a3e4f7220ed1740c0306e79f0ce -rc8eb333514adae8495778ed16c71c41a6eb4251b
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 48e25b3492e67a3e4f7220ed1740c0306e79f0ce)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision c8eb333514adae8495778ed16c71c41a6eb4251b)
@@ -90,7 +90,7 @@
         /// </summary>
         public override IEnumerable<ViewInfo> GetViewInfos()
         {
-            yield return new ViewInfo<FailureMechanismContribution, FailureMechanismContributionView>
+            yield return new ViewInfo<FailureMechanismContributionContext, FailureMechanismContributionView>
             {
                 GetViewName = (v, o) => RingtoetsDataResources.FailureMechanismContribution_DisplayName,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
@@ -199,11 +199,11 @@
                 ContextMenuStrip = CategoryTreeFolderContextMenu
             };
 
-            yield return new TreeNodeInfo<FailureMechanismContribution>
+            yield return new TreeNodeInfo<FailureMechanismContributionContext>
             {
                 Text = failureMechanismContribution => RingtoetsDataResources.FailureMechanismContribution_DisplayName,
                 Image = failureMechanismContribution => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution, treeViewControl)
+                ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution.WrappedData, treeViewControl)
                                                                                                      .AddOpenItem()
                                                                                                      .AddSeparator()
                                                                                                      .AddExportItem()
@@ -240,12 +240,13 @@
             };
         }
 
-        #region FailureMechanismContribution ViewInfo
+        #region FailureMechanismContributionContext ViewInfo
 
         private static bool CloseFailureMechanismContributionViewForData(FailureMechanismContributionView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            return assessmentSection != null && assessmentSection.FailureMechanismContribution == view.Data;
+            var viewData = view.Data as FailureMechanismContributionContext;
+            return assessmentSection != null && viewData != null && assessmentSection.FailureMechanismContribution == viewData.WrappedData;
         }
 
         #endregion
@@ -288,7 +289,7 @@
             var childNodes = new List<object>
             {
                 new ReferenceLineContext(nodeData),
-                nodeData.FailureMechanismContribution,
+                new FailureMechanismContributionContext(nodeData.FailureMechanismContribution, nodeData),
                 new HydraulicBoundaryDatabaseContext(nodeData),
                 new AssessmentSectionCommentContext(nodeData)
             };