Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r4376a372caaaeb42bf19c90fbf1cc012e56766ea -r637378cd38221181a6e221c881fd34260641e788
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 637378cd38221181a6e221c881fd34260641e788)
@@ -575,12 +575,7 @@
                         new DesignWaterLevelCalculationMessageProvider(nodeData.CategoryBoundaryName));
                 });
 
-            string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism);
-            if (!string.IsNullOrEmpty(validationText))
-            {
-                designWaterLevelItem.Enabled = false;
-                designWaterLevelItem.ToolTipText = validationText;
-            }
+            SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection, nodeData.FailureMechanism, designWaterLevelItem);
 
             return Gui.Get(nodeData, treeViewControl)
                       .AddOpenItem()
@@ -623,12 +618,7 @@
                         new WaveHeightCalculationMessageProvider(nodeData.CategoryBoundaryName));
                 });
 
-            string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism);
-            if (!string.IsNullOrEmpty(validationText))
-            {
-                waveHeightItem.Enabled = false;
-                waveHeightItem.ToolTipText = validationText;
-            }
+            SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection, nodeData.FailureMechanism, waveHeightItem);
 
             return Gui.Get(nodeData, treeViewControl)
                       .AddOpenItem()
@@ -1042,7 +1032,7 @@
                     ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
                 });
 
-            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem);
+            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, nodeData.FailureMechanism, waveHeightItem);
 
             return Gui.Get(nodeData, treeViewControl)
                       .AddCustomItem(waveHeightItem)
@@ -1151,7 +1141,7 @@
                     ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
                 });
 
-            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem);
+            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, nodeData.FailureMechanism, waveHeightItem);
 
             return Gui.Get(nodeData, treeViewControl)
                       .AddCustomItem(waveHeightItem)
@@ -1200,9 +1190,11 @@
 
         #endregion
 
-        private static void SetHydraulicsMenuItemEnabledStateAndTooltip(IAssessmentSection assessmentSection, StrictContextMenuItem menuItem)
+        private static void SetHydraulicsMenuItemEnabledStateAndTooltip(IAssessmentSection assessmentSection,
+                                                                        IFailureMechanism failureMechanism,
+                                                                        StrictContextMenuItem menuItem)
         {
-            string validationText = HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
+            string validationText = ValidateAllDataAvailableAndGetErrorMessage(assessmentSection, failureMechanism);
             if (!string.IsNullOrEmpty(validationText))
             {
                 menuItem.Enabled = false;