Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r516f10118109eb4056794904fa280b9df0c7ca1f -rdcca1cc8572f3444a19a7ab3caf32f13207a2494
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 516f10118109eb4056794904fa280b9df0c7ca1f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision dcca1cc8572f3444a19a7ab3caf32f13207a2494)
@@ -575,10 +575,17 @@
                 return ReferenceEquals(commentView.Data, calculationContext.WrappedData);
             }
 
+            var failureMechanism = o as IFailureMechanism;
+
             var failureMechanismContext = o as IFailureMechanismContext<IFailureMechanism>;
             if (failureMechanismContext != null)
             {
-                return GetCommentableElements(failureMechanismContext.WrappedData)
+                failureMechanism = failureMechanismContext.WrappedData;
+            }
+
+            if (failureMechanism != null)
+            {
+                return GetCommentableElements(failureMechanism)
                     .Any(commentableElement => ReferenceEquals(commentView.Data, commentableElement));
             }