Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs
===================================================================
diff -u -r7fd03311c2d51aa209d8bb98347edc6066deb206 -rc83c9a034596ebd85ec7a403f83c75bfd23abffa
--- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs	(.../ProbabilisticPipingCalculationService.cs)	(revision 7fd03311c2d51aa209d8bb98347edc6066deb206)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs	(.../ProbabilisticPipingCalculationService.cs)	(revision c83c9a034596ebd85ec7a403f83c75bfd23abffa)
@@ -90,21 +90,13 @@
 
             CalculationServiceHelper.LogValidationBegin();
 
-            CalculationServiceHelper.LogMessagesAsWarning(PipingCalculationValidationHelper.GetValidationWarnings(calculation.InputParameters).ToArray());
+            LogAnyWarnings(calculation);
 
-            string[] hydraulicBoundaryDatabaseMessages = ValidateHydraulicBoundaryDatabase(assessmentSection).ToArray();
-            CalculationServiceHelper.LogMessagesAsError(hydraulicBoundaryDatabaseMessages);
-            if (hydraulicBoundaryDatabaseMessages.Any())
-            {
-                CalculationServiceHelper.LogValidationEnd();
-                return false;
-            }
+            bool hasErrors = LogAnyErrors(calculation, generalInput, assessmentSection);
 
-            string[] messages = ValidateInput(calculation.InputParameters, generalInput).ToArray();
-            CalculationServiceHelper.LogMessagesAsError(messages);
-
             CalculationServiceHelper.LogValidationEnd();
-            return !messages.Any();
+
+            return !hasErrors;
         }
 
         /// <summary>
@@ -419,6 +411,32 @@
             return null;
         }
 
+        private static void LogAnyWarnings(ProbabilisticPipingCalculation calculation)
+        {
+            CalculationServiceHelper.LogMessagesAsWarning(PipingCalculationValidationHelper.GetValidationWarnings(calculation.InputParameters).ToArray());
+        }
+
+        private static bool LogAnyErrors(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput, IAssessmentSection assessmentSection)
+        {
+            string[] messages = ValidateHydraulicBoundaryDatabase(assessmentSection).ToArray();
+
+            if (messages.Any())
+            {
+                CalculationServiceHelper.LogMessagesAsError(messages);
+                return true;
+            }
+
+            messages = ValidateInput(calculation.InputParameters, generalInput).ToArray();
+
+            if (messages.Any())
+            {
+                CalculationServiceHelper.LogMessagesAsError(messages);
+                return true;
+            }
+
+            return false;
+        }
+
         private static IEnumerable<string> ValidateHydraulicBoundaryDatabase(IAssessmentSection assessmentSection)
         {
             string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory();