Index: Ringtoets/Common/src/Ringtoets.Common.Service/DistributionValidation.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Service/DistributionValidation.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DistributionValidation.cs	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -0,0 +1,139 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.Base.Data;
+using Ringtoets.Common.Data.Probabilistics;
+using Ringtoets.Common.Service.Properties;
+
+namespace Ringtoets.Common.Service
+{
+    /// <summary>
+    /// Service that provides validation methods for probabilistic distributions.
+    /// </summary>
+    public static class DistributionValidation
+    {
+        /// <summary>
+        /// Performs the validation of a <see cref="NormalDistribution"/>.
+        /// </summary>
+        /// <param name="distribution">The distribution to validate.</param>
+        /// <param name="parameterName">The name of the parameter.</param>
+        /// <returns>The validation errors found. Collection is empty if <paramref name="distribution"/> is valid. </returns>
+        public static string[] ValidateDistribution(NormalDistribution distribution, string parameterName)
+        {
+            var validationResult = new List<string>();
+
+            if (IsValidNumber(distribution.Mean))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number,
+                                                   parameterName));
+            }
+
+            if (IsValidNumber(distribution.StandardDeviation))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be_larger_or_equal_to_0,
+                                                   parameterName));
+            }
+
+            return validationResult.ToArray();
+        }
+
+        /// <summary>
+        /// Performs the validation of a <see cref="LogNormalDistribution"/>.
+        /// </summary>
+        /// <param name="distribution">The distribution to validate.</param>
+        /// <param name="parameterName">The name of the parameter.</param>
+        /// <returns>The validation errors found. Collection is empty if <paramref name="distribution"/> is valid.</returns>
+        public static string[] ValidateDistribution(LogNormalDistribution distribution, string parameterName)
+        {
+            var validationResult = new List<string>();
+
+            if (IsValidNumber(distribution.Mean))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_value,
+                                                   parameterName));
+            }
+
+            if (IsValidNumber(distribution.StandardDeviation))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be_larger_or_equal_to_0,
+                                                   parameterName));
+            }
+
+            return validationResult.ToArray();
+        }
+
+        /// <summary>
+        /// Performs the validation of a <see cref="VariationCoefficientNormalDistribution"/>.
+        /// </summary>
+        /// <param name="distribution">The distribution to validate.</param>
+        /// <param name="parameterName">The name of the parameter.</param>
+        /// <returns>The validation errors found. Collection is empty if <paramref name="distribution"/> is valid. </returns>
+        public static string[] ValidateDistribution(VariationCoefficientNormalDistribution distribution, string parameterName)
+        {
+            var validationResult = new List<string>();
+
+            if (IsValidNumber(distribution.Mean))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number,
+                                                   parameterName));
+            }
+
+            if (IsValidNumber(distribution.CoefficientOfVariation))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_must_be_larger_or_equal_to_0,
+                                                   parameterName));
+            }
+
+            return validationResult.ToArray();
+        }
+
+        /// <summary>
+        /// Performs the validation of a <see cref="VariationCoefficientLogNormalDistribution"/>.
+        /// </summary>
+        /// <param name="distribution">The distribution to validate.</param>
+        /// <param name="parameterName">The name of the parameter.</param>
+        /// <returns>The validation errors found. Collection is empty if <paramref name="distribution"/> is valid. </returns>
+        public static string[] ValidateDistribution(VariationCoefficientLogNormalDistribution distribution, string parameterName)
+        {
+            var validationResult = new List<string>();
+
+            if (IsValidNumber(distribution.Mean))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_value,
+                                                   parameterName));
+            }
+
+            if (IsValidNumber(distribution.CoefficientOfVariation))
+            {
+                validationResult.Add(string.Format(Resources.DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_must_be_larger_or_equal_to_0,
+                                                   parameterName));
+            }
+
+            return validationResult.ToArray();
+        }
+
+        private static bool IsValidNumber(RoundedDouble value)
+        {
+            return double.IsNaN(value) || double.IsInfinity(value);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Service/DistributionValidationService.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r1a6804681b0758a5761e39099e4b6de65f9cf4a2 -r3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b
--- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1a6804681b0758a5761e39099e4b6de65f9cf4a2)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -167,7 +167,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De verwachtingswaarde voor &apos;{0}&apos; moet een geldig getal zijn..
+        ///   Looks up a localized string similar to De verwachtingswaarde voor &apos;{0}&apos; moet een concreet getal zijn..
         /// </summary>
         public static string DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number {
             get {
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx
===================================================================
diff -u -r1a6804681b0758a5761e39099e4b6de65f9cf4a2 -r3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b
--- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 1a6804681b0758a5761e39099e4b6de65f9cf4a2)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -169,7 +169,7 @@
     <value>De variatiecoëfficient voor '{0}' moet groter zijn dan of gelijk zijn aan 0.</value>
   </data>
   <data name="DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number" xml:space="preserve">
-    <value>De verwachtingswaarde voor '{0}' moet een geldig getal zijn.</value>
+    <value>De verwachtingswaarde voor '{0}' moet een concreet getal zijn.</value>
   </data>
   <data name="DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_value" xml:space="preserve">
     <value>De verwachtingswaarde voor '{0}' moet een positief getal zijn.</value>
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -rd2753c88b67dda711ab593c1d8a45ed472049d81 -r3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision d2753c88b67dda711ab593c1d8a45ed472049d81)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -48,7 +48,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="CalculationServiceHelper.cs" />
-    <Compile Include="DistributionValidationService.cs" />
+    <Compile Include="DistributionValidation.cs" />
     <Compile Include="WaveHeightCalculationActivity.cs" />
     <Compile Include="WaveHeightCalculationService.cs" />
     <Compile Include="DesignWaterLevelCalculationService.cs" />
Fisheye: Tag 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Service.Test/DistributionValidationServiceTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DistributionValidationTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DistributionValidationTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DistributionValidationTest.cs	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -0,0 +1,235 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Data;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Probabilistics;
+
+namespace Ringtoets.Common.Service.Test
+{
+    [TestFixture]
+    public class DistributionValidationTest
+    {
+        private const string paramName = "<a very nice parametername>";
+
+        [Test]
+        public void ValidateDistribution_ValidNormalDistribution_NoErrorMessage()
+        {
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(new NormalDistribution(2), paramName);
+
+            // Assert
+            CollectionAssert.IsEmpty(message);
+        }
+
+        [Test]
+        public void ValidateDistribution_ValidLogNormalDistribution_NoErrorMessage()
+        {
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(new LogNormalDistribution(2), paramName);
+
+            // Assert
+            CollectionAssert.IsEmpty(message);
+        }
+
+        [Test]
+        public void ValidateDistribution_ValidVariationCoefficientNormalDistribution_NoErrorMessage()
+        {
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(new VariationCoefficientNormalDistribution(2), paramName);
+
+            // Assert
+            CollectionAssert.IsEmpty(message);
+        }
+
+        [Test]
+        public void ValidateDistribution_ValidVariationCoefficientLogNormalDistribution_NoErrorMessage()
+        {
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(new VariationCoefficientLogNormalDistribution(2), paramName);
+
+            // Assert
+            CollectionAssert.IsEmpty(message);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.NegativeInfinity)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidMeanNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De verwachtingswaarde voor '{0}' moet een concreet getal zijn.", paramName);
+            var distribution = new NormalDistribution(2)
+            {
+                Mean = (RoundedDouble) value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidMeanLogNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De verwachtingswaarde voor '{0}' moet een positief getal zijn.", paramName);
+            var distribution = new LogNormalDistribution(2)
+            {
+                Mean = (RoundedDouble)value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.NegativeInfinity)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidMeanVariationCoefficientNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De verwachtingswaarde voor '{0}' moet een concreet getal zijn.", paramName);
+            var distribution = new VariationCoefficientNormalDistribution(2)
+            {
+                Mean = (RoundedDouble)value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidMeanVariationCoefficientLogNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De verwachtingswaarde voor '{0}' moet een positief getal zijn.", paramName);
+            var distribution = new VariationCoefficientLogNormalDistribution(2)
+            {
+                Mean = (RoundedDouble)value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidStandardDeviationNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De standaard afwijking voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", paramName);
+            var distribution = new NormalDistribution(2)
+            {
+                StandardDeviation = (RoundedDouble)value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidStandardDeviationLogNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De standaard afwijking voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", paramName);
+            var distribution = new LogNormalDistribution(2)
+            {
+                StandardDeviation = (RoundedDouble)value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidVariationCoefficientNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De variatiecoëfficient voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", paramName);
+            var distribution = new VariationCoefficientNormalDistribution(2)
+            {
+                CoefficientOfVariation = (RoundedDouble)value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+
+        [Test]
+        [TestCase(double.NaN)]
+        [TestCase(double.PositiveInfinity)]
+        public void ValidateDistribution_InvalidVariationCoefficientLogNormalDistribution_ErrorMessage(double value)
+        {
+            // Setup 
+            var expectedMessage = string.Format("De variatiecoëfficient voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", paramName);
+            var distribution = new VariationCoefficientLogNormalDistribution(2)
+            {
+                CoefficientOfVariation = (RoundedDouble)value
+            };
+
+            // Call
+            string[] message = DistributionValidation.ValidateDistribution(distribution, paramName);
+
+            // Assert
+            Assert.AreEqual(1, message.Length);
+            StringAssert.StartsWith(expectedMessage, message[0]);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -r3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -61,7 +61,7 @@
     <Compile Include="DateTimeServiceTest.cs" />
     <Compile Include="DesignWaterLevelCalculationActivityTest.cs" />
     <Compile Include="DesignWaterLevelCalculationServiceTest.cs" />
-    <Compile Include="DistributionValidationServiceTest.cs" />
+    <Compile Include="DistributionValidationTest.cs" />
     <Compile Include="ProbabilityAssessmentServiceTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RingtoetsCommonDataCalculationServiceTest.cs" />
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -r3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -191,36 +191,36 @@
             }
             else
             {
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.StormDuration,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_StormDuration_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.StormDuration,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_StormDuration_DisplayName)));
 
                 if (IsInvalidNumber(inputParameters.DeviationWaveDirection))
                 {
                     validationResult.Add(string.Format(RingtoetsCommonServiceResources.Validation_ValidateInput_No_value_entered_for_0_,
                                                        GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_DeviationWaveDirection_DisplayName)));
                 }
 
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.ModelFactorSuperCriticalFlow,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_ModelFactorSuperCriticalFlow_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.ModelFactorSuperCriticalFlow,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_ModelFactorSuperCriticalFlow_DisplayName)));
 
                 if (IsInvalidNumber(inputParameters.StructureNormalOrientation))
                 {
                     validationResult.Add(string.Format(RingtoetsCommonServiceResources.Validation_ValidateInput_No_value_entered_for_0_,
                                                        GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Orientation_DisplayName)));
                 }
 
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.FlowWidthAtBottomProtection,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_FlowWidthAtBottomProtection_DisplayName)));
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.WidthFlowApertures,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_WidthFlowApertures_DisplayName)));
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.StorageStructureArea,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_StorageStructureArea_DisplayName)));
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.AllowedLevelIncreaseStorage,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName)));
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.LevelCrestStructure,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_LevelCrestStructure_DisplayName)));
-                validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.CriticalOvertoppingDischarge,
-                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.FlowWidthAtBottomProtection,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_FlowWidthAtBottomProtection_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.WidthFlowApertures,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_WidthFlowApertures_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.StorageStructureArea,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_StorageStructureArea_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.AllowedLevelIncreaseStorage,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.LevelCrestStructure,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_LevelCrestStructure_DisplayName)));
+                validationResult.AddRange(DistributionValidation.ValidateDistribution(inputParameters.CriticalOvertoppingDischarge,
+                                                                                      GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName)));
             }
 
             return validationResult.ToArray();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -r3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -277,7 +277,7 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
 
             string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-            string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een geldig getal zijn.", parameterName);
+            string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een concreet getal zijn.", parameterName);
 
             using (var importer = new HydraulicBoundaryDatabaseImporter())
             {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -r3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 3507fb0dc4848167faeb5a7cb4d1b01a7b78e98b)
@@ -266,7 +266,7 @@
             assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
             const string name = "<very nice name>";
-            string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een geldig getal zijn.", parameterName);
+            string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een concreet getal zijn.", parameterName);
 
             var calculation = new TestHeightStructuresCalculation()
             {