Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r3023413fe1c0f6dd469e8d16f3a6ebf25adac5da -r2731ce4dea0447322aef9238f4ef33cffe864c9e
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 3023413fe1c0f6dd469e8d16f3a6ebf25adac5da)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 2731ce4dea0447322aef9238f4ef33cffe864c9e)
@@ -271,45 +271,38 @@
         {
             List<string> validationResult = new List<string>();
 
-            if (assessmentSection.HydraulicBoundaryDatabase == null)
+            var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
+            if (!string.IsNullOrEmpty(validationProblem))
             {
-                validationResult.Add(RingtoetsCommonServiceResources.CalculationService_ValidateInput_No_hydraulic_boundary_database_selected);
+                validationResult.Add(validationProblem);
+                return validationResult.ToArray();
             }
+
+            if (inputParameters.HydraulicBoundaryLocation == null)
+            {
+                validationResult.Add(RingtoetsCommonServiceResources.CalculationService_ValidateInput_No_hydraulic_boundary_location_selected);
+            }
+
+            if (inputParameters.DikeProfile == null)
+            {
+                validationResult.Add(RingtoetsCommonServiceResources.CalculationService_ValidateInput_No_dike_profile_selected);
+            }
             else
             {
-                if (inputParameters.HydraulicBoundaryLocation == null)
+                if (double.IsNaN(inputParameters.Orientation))
                 {
-                    validationResult.Add(RingtoetsCommonServiceResources.CalculationService_ValidateInput_No_hydraulic_boundary_location_selected);
+                    string message = string.Format(RingtoetsCommonServiceResources.Validation_ValidateInput_No_value_entered_for_ParameterName_0_,
+                                                   ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonForms.Orientation_DisplayName));
+                    validationResult.Add(message);
                 }
+            }
 
-                var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
-
-                if (!string.IsNullOrEmpty(validationProblem))
+            if (inputParameters.UseBreakWater)
+            {
+                if (double.IsNaN(inputParameters.BreakWater.Height) || double.IsInfinity(inputParameters.BreakWater.Height))
                 {
-                    validationResult.Add(validationProblem);
+                    validationResult.Add(RingtoetsCommonServiceResources.Validation_Invalid_BreakWaterHeight_value);
                 }
-
-                if (inputParameters.DikeProfile == null)
-                {
-                    validationResult.Add(RingtoetsCommonServiceResources.CalculationService_ValidateInput_No_dike_profile_selected);
-                }
-                else
-                {
-                    if (double.IsNaN(inputParameters.Orientation))
-                    {
-                        string message = string.Format(RingtoetsCommonServiceResources.Validation_ValidateInput_No_value_entered_for_ParameterName_0_,
-                                                       ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonForms.Orientation_DisplayName));
-                        validationResult.Add(message);
-                    }
-                }
-
-                if (inputParameters.UseBreakWater)
-                {
-                    if (double.IsNaN(inputParameters.BreakWater.Height) || double.IsInfinity(inputParameters.BreakWater.Height))
-                    {
-                        validationResult.Add(RingtoetsCommonServiceResources.Validation_Invalid_BreakWaterHeight_value);
-                    }
-                }
             }
 
             return validationResult.ToArray();