Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2 -rc73100fd8408a2865d6fb32bd17608502686b605
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision c73100fd8408a2865d6fb32bd17608502686b605)
@@ -370,7 +370,9 @@
                           .AddSeparator()
                           .AddToggleRelevancyOfFailureMechanismItem(pipingFailureMechanismContext, RemoveAllViewsForItem)
                           .AddSeparator()
-                          .AddValidateAllCalculationsInFailureMechanismItem(pipingFailureMechanismContext.WrappedData, fm => ValidateAll(fm.Calculations.OfType<PipingCalculation>()))
+                          .AddValidateAllCalculationsInFailureMechanismItem(
+                            pipingFailureMechanismContext, 
+                            fm => ValidateAll(fm.WrappedData.Calculations.OfType<PipingCalculation>()))
                           .AddPerformAllCalculationsInFailureMechanismItem(pipingFailureMechanismContext, CalculateAll)
                           .AddClearAllCalculationOutputInFailureMechanismItem(pipingFailureMechanismContext.WrappedData)
                           .AddSeparator()
@@ -453,7 +455,7 @@
 
             PipingCalculation calculation = nodeData.WrappedData;
 
-            return builder.AddValidateCalculationItem(calculation, c => PipingCalculationService.Validate(c))
+            return builder.AddValidateCalculationItem(nodeData, c => PipingCalculationService.Validate(c.WrappedData))
                           .AddPerformCalculationItem(calculation, nodeData, PerformCalculation)
                           .AddClearCalculationOutputItem(calculation)
                           .AddSeparator()
@@ -574,7 +576,7 @@
             builder.AddCreateCalculationGroupItem(group)
                    .AddCreateCalculationItem(nodeData, AddCalculationScenario)
                    .AddSeparator()
-                   .AddValidateAllCalculationsInGroupItem(group, nodeData, (g, c) => ValidateAll(g.GetCalculations().OfType<PipingCalculation>()))
+                   .AddValidateAllCalculationsInGroupItem(nodeData, c => ValidateAll(c.WrappedData.GetCalculations().OfType<PipingCalculation>()))
                    .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAll)
                    .AddClearAllCalculationOutputInGroupItem(group)
                    .AddSeparator();