Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -r7eb22f46c5d3e37a35bc8715d9369804e4957b35 -rab45f4134c0ec2f1ee0acd65919784d3f39912e7
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision 7eb22f46c5d3e37a35bc8715d9369804e4957b35)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision ab45f4134c0ec2f1ee0acd65919784d3f39912e7)
@@ -98,7 +98,12 @@
             GrassCoverErosionOutwardsWaveConditionsInput calculationInput = calculation.InputParameters;
             GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType = calculationInput.CalculationType;
 
-            ValidateCalculationType(calculationType);
+            if (!Enum.IsDefined(typeof(GrassCoverErosionOutwardsWaveConditionsCalculationType), calculationType))
+            {
+                throw new InvalidEnumArgumentException(nameof(calculationType), (int) calculationType,
+                                                       typeof(GrassCoverErosionOutwardsWaveConditionsCalculationType));
+            }
+
             CalculationServiceHelper.LogCalculationBegin();
 
             RoundedDouble assessmentLevel = failureMechanism.GetAssessmentLevel(assessmentSection,
@@ -147,29 +152,6 @@
             }
         }
 
-        /// <summary>
-        /// Validates the <see cref="GrassCoverErosionOutwardsWaveConditionsCalculationType"/> input.
-        /// </summary>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when an undefined enum is used as input.</exception>
-        /// <exception cref="NotSupportedException">Thrown when a defined enum, but is unsupported is used as input.</exception>
-        private static void ValidateCalculationType(GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType)
-        {
-            if (!Enum.IsDefined(typeof(GrassCoverErosionOutwardsWaveConditionsCalculationType), calculationType))
-            {
-                throw new InvalidEnumArgumentException(nameof(calculationType), (int) calculationType,
-                                                       typeof(GrassCoverErosionOutwardsWaveConditionsCalculationType));
-            }
-
-            if (calculationType == GrassCoverErosionOutwardsWaveConditionsCalculationType.Both
-                || calculationType == GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUp
-                || calculationType == GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpact)
-            {
-                return;
-            }
-
-            throw new NotSupportedException();
-        }
-
         private static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutput(GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType,
                                                                                   IEnumerable<WaveConditionsOutput> waveRunUpOutput,
                                                                                   IEnumerable<WaveConditionsOutput> waveImpactOutput)
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -r50c61b470cd71b77a24ec39d7990ccf548109dd2 -rab45f4134c0ec2f1ee0acd65919784d3f39912e7
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision 50c61b470cd71b77a24ec39d7990ccf548109dd2)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision ab45f4134c0ec2f1ee0acd65919784d3f39912e7)
@@ -87,17 +87,22 @@
                 throw new ArgumentNullException(nameof(generalWaveConditionsInput));
             }
 
-            StabilityStoneCoverWaveConditionsCalculationType calculationType = calculation.InputParameters.CalculationType;
-            ValidateCalculationType(calculationType);
+            StabilityStoneCoverWaveConditionsInput calculationInput = calculation.InputParameters;
+            StabilityStoneCoverWaveConditionsCalculationType calculationType = calculationInput.CalculationType;
+            if (!Enum.IsDefined(typeof(StabilityStoneCoverWaveConditionsCalculationType), calculationType))
+            {
+                throw new InvalidEnumArgumentException(nameof(calculationType), (int) calculationType,
+                                                       typeof(StabilityStoneCoverWaveConditionsCalculationType));
+            }
 
             CalculationServiceHelper.LogCalculationBegin();
 
-            double norm = assessmentSection.GetNorm(calculation.InputParameters.CategoryType);
+            double norm = assessmentSection.GetNorm(calculationInput.CategoryType);
 
-            RoundedDouble assessmentLevel = assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
-                                                                                 calculation.InputParameters.CategoryType);
+            RoundedDouble assessmentLevel = assessmentSection.GetAssessmentLevel(calculationInput.HydraulicBoundaryLocation,
+                                                                                 calculationInput.CategoryType);
 
-            int waterLevelCount = calculation.InputParameters.GetWaterLevels(assessmentLevel).Count();
+            int waterLevelCount = calculationInput.GetWaterLevels(assessmentLevel).Count();
             TotalWaterLevelCalculations = calculationType == StabilityStoneCoverWaveConditionsCalculationType.Both
                                               ? waterLevelCount * 2
                                               : waterLevelCount;
@@ -155,29 +160,6 @@
             return StabilityStoneCoverWaveConditionsOutputFactory.CreateOutputWithColumnsAndBlocks(columnsOutputs, blocksOutputs);
         }
 
-        /// <summary>
-        /// Validates the <see cref="StabilityStoneCoverWaveConditionsCalculationType"/> input.
-        /// </summary>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when an undefined enum is used as input.</exception>
-        /// <exception cref="NotSupportedException">Thrown when a defined enum, but is unsupported is used as input.</exception>
-        private static void ValidateCalculationType(StabilityStoneCoverWaveConditionsCalculationType calculationType)
-        {
-            if (!Enum.IsDefined(typeof(StabilityStoneCoverWaveConditionsCalculationType), calculationType))
-            {
-                throw new InvalidEnumArgumentException(nameof(calculationType), (int) calculationType,
-                                                       typeof(StabilityStoneCoverWaveConditionsCalculationType));
-            }
-
-            if (calculationType == StabilityStoneCoverWaveConditionsCalculationType.Both
-                || calculationType == StabilityStoneCoverWaveConditionsCalculationType.Blocks
-                || calculationType == StabilityStoneCoverWaveConditionsCalculationType.Columns)
-            {
-                return;
-            }
-
-            throw new NotSupportedException();
-        }
-
         private IEnumerable<WaveConditionsOutput> CalculateColumns(StabilityStoneCoverWaveConditionsCalculation calculation,
                                                                    IAssessmentSection assessmentSection, RoundedDouble assessmentLevel,
                                                                    GeneralWaveConditionsInput generalInput, double norm)