Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs
===================================================================
diff -u -r990dd12909ff8c0f941c5b06434ee6258085e5ec -rcc34c73b516e679baeb7f211c5b90027531a8403
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision 990dd12909ff8c0f941c5b06434ee6258085e5ec)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision cc34c73b516e679baeb7f211c5b90027531a8403)
@@ -29,6 +29,7 @@
 using Ringtoets.Piping.Primitives;
 using Ringtoets.Piping.Service.Properties;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Service
 {
@@ -105,16 +106,11 @@
         {
             List<string> validationResult = new List<string>();
 
-            var isHydraulicBoundaryLocationMissing = inputParameters.HydraulicBoundaryLocation == null;
             var isSoilProfileMissing = inputParameters.StochasticSoilProfile == null;
             var isSurfaceLineMissing = inputParameters.SurfaceLine == null;
             var isExitPointLMissing = double.IsNaN(inputParameters.ExitPointL);
             var isEntryPointLMissing = double.IsNaN(inputParameters.EntryPointL);
 
-            if (isHydraulicBoundaryLocationMissing)
-            {
-                validationResult.Add(Resources.PipingCalculationService_ValidateInput_No_HydraulicBoundaryLocation_selected);
-            }
 
             if (isSurfaceLineMissing)
             {
@@ -136,17 +132,15 @@
                 validationResult.Add(Resources.PipingCalculationService_ValidateInput_No_value_for_ExitPointL);
             }
 
-            if (!isHydraulicBoundaryLocationMissing)
+            if (double.IsNaN(inputParameters.AssessmentLevel) || double.IsInfinity(inputParameters.AssessmentLevel))
             {
-                if (double.IsNaN(inputParameters.AssessmentLevel))
-                {
-                    validationResult.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_AssessmentLevel);
-                }
-                if (double.IsNaN(inputParameters.PiezometricHeadExit))
-                {
-                    validationResult.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_PiezometricHeadExit);
-                }
+                validationResult.Add(string.Format(RingtoetsCommonServiceResources.Validation_ValidateInput_No_concrete_value_entered_for_ParameterName_0_,
+                                                   ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonFormsResources.AssessmentLevel_DisplayName)));
             }
+            if (double.IsNaN(inputParameters.PiezometricHeadExit) || double.IsInfinity(inputParameters.PiezometricHeadExit))
+            {
+                validationResult.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_PiezometricHeadExit);
+            }
 
             if (!isSurfaceLineMissing && !isSoilProfileMissing && !isExitPointLMissing)
             {