Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -re8faf56fec441bd97d5791a1a867c146c94ac85d -r4226f06ff99721d716c02604e686b9ba4e709f7c
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision e8faf56fec441bd97d5791a1a867c146c94ac85d)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 4226f06ff99721d716c02604e686b9ba4e709f7c)
@@ -575,10 +575,9 @@
             foreach (WaveImpactAsphaltCoverWaveConditionsCalculation calculation in context.WrappedData.GetCalculations().OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>())
             {
                 WaveConditionsCalculationServiceBase.Validate(calculation.InputParameters,
-                                                              context.AssessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
-                                                                                                           calculation.InputParameters.CategoryType),
+                                                              WaveConditionsInputHelper.GetAssessmentLevel(calculation.InputParameters, context.AssessmentSection),
                                                               context.AssessmentSection.HydraulicBoundaryDatabase,
-                                                              context.AssessmentSection.GetNorm(calculation.InputParameters.CategoryType));
+                                                              WaveConditionsInputHelper.GetTargetProbability(calculation.InputParameters, context.AssessmentSection));
             }
         }
 
@@ -662,10 +661,9 @@
             WaveImpactAsphaltCoverWaveConditionsCalculation calculation = context.WrappedData;
 
             WaveConditionsCalculationServiceBase.Validate(calculation.InputParameters,
-                                                          assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
-                                                                                               calculation.InputParameters.CategoryType),
+                                                          WaveConditionsInputHelper.GetAssessmentLevel(calculation.InputParameters, context.AssessmentSection),
                                                           assessmentSection.HydraulicBoundaryDatabase,
-                                                          assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
+                                                          WaveConditionsInputHelper.GetTargetProbability(calculation.InputParameters, context.AssessmentSection));
         }
 
         private void Calculate(WaveImpactAsphaltCoverWaveConditionsCalculationContext context)