Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r5724d9646d808c712d3bd87ecc89d8e23426c83f -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 5724d9646d808c712d3bd87ecc89d8e23426c83f)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -35,6 +35,7 @@
 using Ringtoets.ClosingStructures.Forms.Views;
 using Ringtoets.ClosingStructures.IO;
 using Ringtoets.ClosingStructures.Service;
+using Ringtoets.ClosingStructures.Utils;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
@@ -489,8 +490,11 @@
 
             ClosingStructuresCalculation calculation = context.WrappedData;
 
-            return builder.AddValidateCalculationItem(context, ValidateAction, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
-                          .AddPerformCalculationItem(calculation, context, CalculateAction, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+            return builder.AddValidateCalculationItem(
+                context,
+                c => new ClosingStructuresCalculationService().Validate(c.WrappedData, c.AssessmentSection),
+                ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+                          .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddClearCalculationOutputItem(calculation)
                           .AddSeparator()
                           .AddRenameItem()
@@ -503,10 +507,15 @@
                           .Build();
         }
 
-        private static void CalculateAction(ClosingStructuresCalculation closingStructuresCalculation, ClosingStructuresCalculationContext closingStructuresCalculationContext) {}
+        private void Calculate(ClosingStructuresCalculation calculation, ClosingStructuresCalculationContext context)
+        {
+            ActivityProgressDialogRunner.Run(Gui.MainWindow,
+                                             new ClosingStructuresCalculationActivity(calculation,
+                                                                                      Path.GetDirectoryName(context.AssessmentSection.HydraulicBoundaryDatabase.FilePath),
+                                                                                      context.FailureMechanism,
+                                                                                      context.AssessmentSection));
+        }
 
-        private static void ValidateAction(ClosingStructuresCalculationContext closingStructuresCalculationContext) {}
-
         private static string ValidateAllDataAvailableAndGetErrorMessageForCalculation(ClosingStructuresCalculationContext context)
         {
             return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism);
@@ -518,6 +527,9 @@
             if (calculationGroupContext != null)
             {
                 calculationGroupContext.WrappedData.Children.Remove(context.WrappedData);
+                ClosingStructuresHelper.Delete(context.FailureMechanism.SectionResults,
+                                               context.WrappedData,
+                                               context.FailureMechanism.Calculations.Cast<ClosingStructuresCalculation>());
                 calculationGroupContext.NotifyObservers();
             }
         }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj
===================================================================
diff -u -r10ebec09145f1bdb1294fe2c98e77c492069fc2d -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj	(.../Ringtoets.ClosingStructures.Plugin.csproj)	(revision 10ebec09145f1bdb1294fe2c98e77c492069fc2d)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj	(.../Ringtoets.ClosingStructures.Plugin.csproj)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -125,6 +125,11 @@
       <Name>Ringtoets.ClosingStructures.Service</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.ClosingStructures.Utils\Ringtoets.ClosingStructures.Utils.csproj">
+      <Project>{09A12A95-370D-42FE-B18E-32821D7A62BA}</Project>
+      <Name>Ringtoets.ClosingStructures.Utils</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -r048ca910b1d2e3ddcd6a59eea8b6ccf2bdf63116 -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 048ca910b1d2e3ddcd6a59eea8b6ccf2bdf63116)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -33,6 +33,8 @@
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
 using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.IO;
+using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Service
 {
@@ -62,7 +64,8 @@
                               IAssessmentSection assessmentSection,
                               FailureMechanismSection failureMechanismSection,
                               GeneralClosingStructuresInput generalInput,
-                              double failureMechanismContribution, string hlcdDirectory)
+                              double failureMechanismContribution,
+                              string hlcdDirectory)
         {
             var calculationName = calculation.Name;
 
@@ -127,10 +130,11 @@
         public bool Validate(ClosingStructuresCalculation calculation, IAssessmentSection assessmentSection)
         {
             CalculationServiceHelper.LogValidationBeginTime(calculation.Name);
-            //TODO: Validate all the input parameters here, see WTI-926
+            var messages = ValidateInput(calculation.InputParameters, assessmentSection);
+            CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonServiceResources.Error_in_validation_0, messages);
             CalculationServiceHelper.LogValidationEndTime(calculation.Name);
 
-            return true;
+            return !messages.Any();
         }
 
         private static StructuresClosureVerticalWallCalculationInput CreateClosureVerticalWallCalculationInput(ClosingStructuresCalculation calculation,
@@ -231,5 +235,24 @@
         {
             return input.UseBreakWater ? new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height) : null;
         }
+
+        private static string[] ValidateInput(ClosingStructuresInput inputParameters, IAssessmentSection assessmentSection)
+        {
+            var validationResult = new List<string>();
+
+            var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
+            if (!string.IsNullOrEmpty(validationProblem))
+            {
+                validationResult.Add(validationProblem);
+                return validationResult.ToArray();
+            }
+
+            if (inputParameters.HydraulicBoundaryLocation == null)
+            {
+                validationResult.Add(RingtoetsCommonServiceResources.CalculationService_ValidateInput_No_hydraulic_boundary_location_selected);
+            }
+			//TODO: Validate all the input parameters here, see WTI-926
+            return validationResult.ToArray();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj
===================================================================
diff -u -r048ca910b1d2e3ddcd6a59eea8b6ccf2bdf63116 -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 048ca910b1d2e3ddcd6a59eea8b6ccf2bdf63116)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -90,6 +90,11 @@
       <Name>Ringtoets.HydraRing.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.IO\Ringtoets.HydraRing.IO.csproj">
+      <Project>{B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}</Project>
+      <Name>Ringtoets.HydraRing.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs
===================================================================
diff -u -rb3c014c2be30221e652058627ac9f86443f688b9 -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs	(.../TestClosingStructureCalculationTest.cs)	(revision b3c014c2be30221e652058627ac9f86443f688b9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs	(.../TestClosingStructureCalculationTest.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -66,6 +66,7 @@
                             calculation.InputParameters.FactorStormDurationOpenStructure.GetAccuracy());
             Assert.AreEqual(0, calculation.InputParameters.DeviationWaveDirection,
                             calculation.InputParameters.DeviationWaveDirection.GetAccuracy());
+            Assert.AreEqual(1.0, calculation.InputParameters.FailureProbabilityStructureWithErosion);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs
===================================================================
diff -u -rb3c014c2be30221e652058627ac9f86443f688b9 -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs	(.../TestClosingStructuresCalculation.cs)	(revision b3c014c2be30221e652058627ac9f86443f688b9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs	(.../TestClosingStructuresCalculation.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -31,13 +31,8 @@
             InputParameters.Structure = new TestClosingStructure();
             InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "location", 1, 1);
             InputParameters.FactorStormDurationOpenStructure = (RoundedDouble) 1;
-//            InputParameters.FailureProbabilityStructureWithErosion = 1;
+            InputParameters.FailureProbabilityStructureWithErosion = 1;
             InputParameters.DeviationWaveDirection = (RoundedDouble) 0;
-//            InputParameters.StorageStructureArea.Mean = (RoundedDouble) 1.0;
-//            InputParameters.StructureNormalOrientation = (RoundedDouble) 115;
-//            InputParameters.WidthFlowApertures.Mean = (RoundedDouble) 18;
-//            InputParameters.FlowWidthAtBottomProtection.Mean = (RoundedDouble) 18;
-//            InputParameters.AllowedLevelIncreaseStorage.Mean = (RoundedDouble) 1.0;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -r2ec06c41e23172aee5fba6f3b6588486c922514b -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 2ec06c41e23172aee5fba6f3b6588486c922514b)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -134,10 +134,18 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
+      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
+      <Name>Ringtoets.HydraRing.Calculation</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
       <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
       <Name>Ringtoets.HydraRing.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\test\Ringtoets.HydraRing.Calculation.TestUtil\Ringtoets.HydraRing.Calculation.TestUtil.csproj">
+      <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
+      <Name>Ringtoets.HydraRing.Calculation.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r968cbe97d1a910b9bbb0fb52b22ece65126ed675 -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -27,27 +28,33 @@
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
+using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
+using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.ClosingStructures.Plugin;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.HydraRing.Calculation.Calculator.Factory;
+using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonServicesResources = Ringtoets.Common.Service.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class ClosingStructuresCalculationContextTreeNodeInfoTest
+    public class ClosingStructuresCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuValidateIndex = 0;
         private const int contextMenuCalculateIndex = 1;
@@ -73,7 +80,7 @@
         }
 
         [TearDown]
-        public void TearDown()
+        public override void TearDown()
         {
             plugin.Dispose();
             mocks.VerifyAll();
@@ -287,7 +294,7 @@
                                                                   "Er is geen vakindeling geïmporteerd.",
                                                                   RingtoetsCommonFormsResources.CalculateIcon,
                                                                   false);
-                    
+
                     TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
                                                                   "&Valideren",
                                                                   "Er is geen vakindeling geïmporteerd.",
@@ -434,6 +441,223 @@
         }
 
         [Test]
+        public void ContextMenuStrip_NoFailureMechanismSections_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
+        {
+            // Setup
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+            var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+            var calculation = new ClosingStructuresCalculation();
+
+            var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
+                {
+                    // Assert
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+                                                                  "&Valideren",
+                                                                  "Er is geen vakindeling geïmporteerd.",
+                                                                  RingtoetsCommonFormsResources.ValidateIcon,
+                                                                  false);
+                }
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetNoHydraulicBoundaryDatabase_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
+        {
+            // Setup
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+
+            var calculation = new ClosingStructuresCalculation();
+            var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
+                {
+                    // Assert
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+                                                                  RingtoetsCommonFormsResources.Validate,
+                                                                  RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                                  RingtoetsCommonFormsResources.ValidateIcon,
+                                                                  false);
+                }
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetHydraulicBoundaryDatabaseNotValid_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
+        {
+            // Setup
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+
+            var calculation = new ClosingStructuresCalculation();
+            var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                assessmentSectionStub.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
+                {
+                    // Assert
+                    ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex];
+
+                    Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text);
+                    StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                    TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image);
+                    Assert.IsFalse(contextMenuItem.Enabled);
+                }
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsAndHydraulicBoundaryDatabaseSet_ContextMenuItemValidateCalculationEnabled()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath,
+                Version = "1.0"
+            };
+
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+
+            var calculation = new ClosingStructuresCalculation();
+            var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
+                plugin.Gui = guiMock;
+
+                // Call
+                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
+                {
+                    // Assert
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+                                                                  RingtoetsCommonFormsResources.Validate,
+                                                                  RingtoetsCommonFormsResources.Validate_ToolTip,
+                                                                  RingtoetsCommonFormsResources.ValidateIcon);
+                }
+            }
+        }
+
+        [Test]
+        public void GivenCalculationWithNonExistingFilePath_WhenValidatingFromContextMenu_ThenLogMessagesAdded()
+        {
+            // Given
+            var observerMock = mocks.StrictMock<IObserver>();
+
+            var section = new FailureMechanismSection("A", new[]
+            {
+                new Point2D(1, 2),
+                new Point2D(3, 4)
+            });
+
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+            failureMechanism.AddSection(section);
+
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0.0, 1.1);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath,
+                Version = "random"
+            };
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
+            var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+
+            var calculation = new TestClosingStructuresCalculation()
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation,
+                }
+            };
+
+            var calculationContext = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(calculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
+                plugin.Gui = guiMock;
+
+                calculation.Attach(observerMock);
+
+                using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl))
+                {
+                    // When
+                    Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick();
+
+                    // Then
+                    TestHelper.AssertLogMessages(action, messages =>
+                    {
+                        var msgs = messages.ToArray();
+                        Assert.AreEqual(2, msgs.Length);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                        StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                    });
+                }
+            }
+        }
+
+        [Test]
         public void OnNodeRemoved_ParentIsCalculationGroupContext_RemoveCalculationFromGroup()
         {
             // Setup
@@ -469,6 +693,39 @@
             CollectionAssert.DoesNotContain(group.Children, elementToBeRemoved);
         }
 
+        [Test]
+        public void OnNodeRemoved_CalculationInGroupAssignedToSection_CalculationDetachedFromSection()
+        {
+            // Setup
+            var group = new CalculationGroup();
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+            var elementToBeRemoved = new ClosingStructuresCalculation();
+            var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+            var calculationContext = new ClosingStructuresCalculationContext(elementToBeRemoved,
+                                                                             failureMechanism,
+                                                                             assessmentSectionStub);
+            var groupContext = new ClosingStructuresCalculationGroupContext(group,
+                                                                            failureMechanism,
+                                                                            assessmentSectionStub);
+
+            mocks.ReplayAll();
+
+            group.Children.Add(elementToBeRemoved);
+
+            failureMechanism.AddSection(new FailureMechanismSection("section", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            failureMechanism.SectionResults.First().Calculation = elementToBeRemoved;
+
+            // Call
+            info.OnNodeRemoved(calculationContext, groupContext);
+
+            // Assert
+            Assert.IsNull(failureMechanism.SectionResults.First().Calculation);
+        }
+
         private class TestClosingStructuresOutput : ProbabilityAssessmentOutput
         {
             public TestClosingStructuresOutput() : base(0, 0, 0, 0, 0) {}
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -rc4633eaee0402f974fc155295c5a9461bb322d4e -r83024e3b1086e1dba93b83df874bd4781f67aa63
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision c4633eaee0402f974fc155295c5a9461bb322d4e)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
@@ -427,13 +427,13 @@
         public void Calculate_InvalidCalculation_LogStartAndEndAndErrorMessageAndThrowsException(ClosingStructureInflowModelType inflowModelType)
         {
             // Setup
-            var heightStructuresFailureMechanism = new ClosingStructuresFailureMechanism();
+            var closingStructuresFailureMechanism = new ClosingStructuresFailureMechanism();
 
             var mockRepository = new MockRepository();
-            var assessmentSectionStub = CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository);
+            var assessmentSectionStub = CreateAssessmentSectionStub(closingStructuresFailureMechanism, mockRepository);
             mockRepository.ReplayAll();
 
-            heightStructuresFailureMechanism.AddSection(new FailureMechanismSection("test section", new[]
+            closingStructuresFailureMechanism.AddSection(new FailureMechanismSection("test section", new[]
             {
                 new Point2D(0, 0),
                 new Point2D(1, 1)
@@ -447,7 +447,7 @@
                 }
             };
 
-            var failureMechanismSection = heightStructuresFailureMechanism.Sections.First();
+            FailureMechanismSection failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
             var exception = false;
 
             // Call
@@ -458,8 +458,8 @@
                     new ClosingStructuresCalculationService().Calculate(calculation,
                                                                         assessmentSectionStub,
                                                                         failureMechanismSection,
-                                                                        heightStructuresFailureMechanism.GeneralInput,
-                                                                        heightStructuresFailureMechanism.Contribution,
+                                                                        closingStructuresFailureMechanism.GeneralInput,
+                                                                        closingStructuresFailureMechanism.Contribution,
                                                                         testDataPath);
                 }
                 catch