Index: Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -re1a54c5cbdeb8c34d4d77a66459b429d254a1388
--- Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision e1a54c5cbdeb8c34d4d77a66459b429d254a1388)
@@ -23,11 +23,8 @@
 using System.Collections.Generic;
 using Core.Gui.Forms;
 using Core.Gui.Forms.ProgressDialog;
-using log4net;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Hydraulics;
-using Riskeer.Common.Forms.Properties;
-using Riskeer.Common.IO.HydraRing;
 using Riskeer.Common.Service;
 
 namespace Riskeer.Common.Forms.GuiServices
@@ -37,7 +34,6 @@
     /// </summary>
     public class HydraulicBoundaryLocationCalculationGuiService : IHydraulicBoundaryLocationCalculationGuiService
     {
-        private static readonly ILog log = LogManager.GetLogger(typeof(HydraulicBoundaryLocationCalculationGuiService));
         private readonly IViewParent viewParent;
 
         /// <summary>
@@ -70,12 +66,8 @@
                 throw new ArgumentNullException(nameof(calculations));
             }
 
-            RunActivities(assessmentSection.HydraulicBoundaryData,
-                          HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                              calculations,
-                              assessmentSection,
-                              targetProbability,
-                              calculationIdentifier));
+            ActivityProgressDialogRunner.Run(viewParent, HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
+                                                 calculations, assessmentSection, targetProbability, calculationIdentifier));
         }
 
         public void CalculateWaveHeights(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
@@ -93,30 +85,8 @@
                 throw new ArgumentNullException(nameof(calculations));
             }
 
-            RunActivities(assessmentSection.HydraulicBoundaryData,
-                          HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                              calculations,
-                              assessmentSection,
-                              targetProbability,
-                              calculationIdentifier));
+            ActivityProgressDialogRunner.Run(viewParent, HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
+                                                 calculations, assessmentSection, targetProbability, calculationIdentifier));
         }
-
-        private void RunActivities(HydraulicBoundaryData hydraulicBoundaryData, IEnumerable<CalculatableActivity> activities)
-        {
-            string validationProblem = HydraulicBoundaryDataHelper.ValidateFilesForCalculation(
-                hydraulicBoundaryData.FilePath,
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath,
-                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.UsePreprocessorClosure);
-
-            if (string.IsNullOrEmpty(validationProblem))
-            {
-                ActivityProgressDialogRunner.Run(viewParent, activities);
-            }
-            else
-            {
-                log.ErrorFormat(Resources.CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_,
-                                validationProblem);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -ra451cc24b9153910681c63291b6747e26fb72c3f -re1a54c5cbdeb8c34d4d77a66459b429d254a1388
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision a451cc24b9153910681c63291b6747e26fb72c3f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision e1a54c5cbdeb8c34d4d77a66459b429d254a1388)
@@ -113,34 +113,6 @@
         }
 
         [Test]
-        public void CalculateDesignWaterLevels_HydraulicBoundaryDatabaseDoesNotExist_LogsError()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var viewParent = mocks.Stub<IViewParent>();
-            IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
-            mocks.ReplayAll();
-
-            assessmentSection.HydraulicBoundaryData.FilePath = "Does not exist";
-            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath = "Does not exist";
-
-            var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
-
-            // Call
-            void Call() => guiService.CalculateDesignWaterLevels(Enumerable.Empty<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, "1/100");
-
-            // Assert
-            TestHelper.AssertLogMessages(Call, messages =>
-            {
-                string[] msgs = messages.ToArray();
-                Assert.AreEqual(1, msgs.Length);
-                StringAssert.StartsWith("Berekeningen konden niet worden gestart. ", msgs.First());
-            });
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void CalculateDesignWaterLevels_ValidPathEmptyCalculationList_NoLog()
         {
             // Setup
@@ -285,33 +257,6 @@
         }
 
         [Test]
-        public void CalculateWaveHeights_HydraulicBoundaryDatabaseDoesNotExist_LogsError()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var viewParent = mocks.Stub<IViewParent>();
-            IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
-            mocks.ReplayAll();
-
-            assessmentSection.HydraulicBoundaryData.FilePath = "Does not exist";
-            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath = "Does not exist";
-
-            var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
-
-            // Call
-            void Call() => guiService.CalculateWaveHeights(Enumerable.Empty<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, "1/100");
-
-            // Assert
-            TestHelper.AssertLogMessages(Call, messages =>
-            {
-                string[] msgs = messages.ToArray();
-                Assert.AreEqual(1, msgs.Length);
-                StringAssert.StartsWith("Berekeningen konden niet worden gestart. ", msgs.First());
-            });
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void CalculateWaveHeights_ValidPathEmptyCalculationList_NoLog()
         {
             // Setup