Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs
===================================================================
diff -u -rd2753c88b67dda711ab593c1d8a45ed472049d81 -r2f20d373b18e86839cee118d7922eb41454af394
--- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d2753c88b67dda711ab593c1d8a45ed472049d81)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2f20d373b18e86839cee118d7922eb41454af394)
@@ -127,46 +127,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De variatiecoëfficient voor &apos;{0}&apos; moet groter zijn dan of gelijk aan 0..
-        /// </summary>
-        public static string DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_must_be_larger_or_equal_to_0 {
-            get {
-                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_mu" +
-                        "st_be_larger_or_equal_to_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De verwachtingswaarde voor &apos;{0}&apos; moet een geldig getal zijn..
-        /// </summary>
-        public static string DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number {
-            get {
-                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_numb" +
-                        "er", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De verwachtingswaarde voor &apos;{0}&apos; moet een positief getal zijn..
-        /// </summary>
-        public static string DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_value {
-            get {
-                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_val" +
-                        "ue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De standaard afwijking voor &apos;{0}&apos; moet groter zijn dan of gelijk aan 0..
-        /// </summary>
-        public static string DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be_larger_or_equal_to_0 {
-            get {
-                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be" +
-                        "_larger_or_equal_to_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Fout.
         /// </summary>
         public static string Error {
Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx
===================================================================
diff -u -rd2753c88b67dda711ab593c1d8a45ed472049d81 -r2f20d373b18e86839cee118d7922eb41454af394
--- Core/Common/src/Core.Common.Base/Properties/Resources.resx	(.../Resources.resx)	(revision d2753c88b67dda711ab593c1d8a45ed472049d81)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.resx	(.../Resources.resx)	(revision 2f20d373b18e86839cee118d7922eb41454af394)
@@ -174,16 +174,4 @@
   <data name="Error" xml:space="preserve">
     <value>Fout</value>
   </data>
-  <data name="DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_must_be_larger_or_equal_to_0" xml:space="preserve">
-    <value>De variatiecoëfficient voor '{0}' moet groter zijn dan of gelijk 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>
-  </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>
-  </data>
-  <data name="DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be_larger_or_equal_to_0" xml:space="preserve">
-    <value>De standaard afwijking voor '{0}' moet groter zijn dan of gelijk aan 0.</value>
-  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DistributionValidationService.cs
===================================================================
diff -u -rd2753c88b67dda711ab593c1d8a45ed472049d81 -r2f20d373b18e86839cee118d7922eb41454af394
--- Ringtoets/Common/src/Ringtoets.Common.Service/DistributionValidationService.cs	(.../DistributionValidationService.cs)	(revision d2753c88b67dda711ab593c1d8a45ed472049d81)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DistributionValidationService.cs	(.../DistributionValidationService.cs)	(revision 2f20d373b18e86839cee118d7922eb41454af394)
@@ -21,8 +21,8 @@
 
 using System.Collections.Generic;
 using Core.Common.Base.Data;
-using Core.Common.Base.Properties;
 using Ringtoets.Common.Data.Probabilistics;
+using Ringtoets.Common.Service.Properties;
 
 namespace Ringtoets.Common.Service
 {
@@ -32,11 +32,18 @@
     public static class DistributionValidationService
     {
         /// <summary>
-        /// Performs the validation of a <see cref="NormalDistribution"/>
+        /// Performs the validation of a <see cref="NormalDistribution"/>.
         /// </summary>
-        /// <param name="distribution"></param>
-        /// <param name="parameterName"></param>
-        /// <returns></returns>
+        /// <param name="distribution">The distribution to validate.</param>
+        /// <param name="parameterName">The name of the parameter.</param>
+        /// <returns>Returns an empty string array if the distribution is valid, else:
+        /// <list type="bullet">
+        /// <item>A message indicating that the <see cref="NormalDistribution.Mean"/> for <paramref name="parameterName"/> 
+        /// must be a valid number, when it is NaN or Infinity.</item>
+        /// <item>A message indicating that the <see cref="NormalDistribution.StandardDeviation"/> for <paramref name="parameterName"/>
+        /// must be larger or equal to 0, when it is NaN or Infinity.</item>
+        /// </list>
+        /// </returns>
         public static string[] ValidateDistribution(NormalDistribution distribution, string parameterName)
         {
             var validationResult = new List<string>();
@@ -54,6 +61,19 @@
             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>Returns an empty string array if the distribution is valid, else:
+        /// <list type="bullet">
+        /// <item>A message indicating that the <see cref="LogNormalDistribution.Mean"/> for <paramref name="parameterName"/> 
+        /// must be a positive number, when it is NaN or Infinity.</item>
+        /// <item>A message indicating that the <see cref="LogNormalDistribution.StandardDeviation"/> for <paramref name="parameterName"/>
+        /// must be larger or equal to 0, when it is NaN or Infinity.</item>
+        /// </list>
+        /// </returns>
         public static string[] ValidateDistribution(LogNormalDistribution distribution, string parameterName)
         {
             var validationResult = new List<string>();
@@ -71,6 +91,19 @@
             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>Returns an empty string array if the distribution is valid, else:
+        /// <list type="bullet">
+        /// <item>A message indicating that the <see cref="VariationCoefficientNormalDistribution.Mean"/> for <paramref name="parameterName"/> 
+        /// must be a valid number, when it is NaN or Infinity.</item>
+        /// <item>A message indicating that the <see cref="VariationCoefficientNormalDistribution.CoefficientOfVariation"/> 
+        /// for <paramref name="parameterName"/> must be larger or equal to 0, when it is NaN or Infinity.</item>
+        /// </list>
+        /// </returns>
         public static string[] ValidateDistribution(VariationCoefficientNormalDistribution distribution, string parameterName)
         {
             var validationResult = new List<string>();
@@ -88,6 +121,19 @@
             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>Returns an empty string array if the distribution is valid, else:
+        /// <list type="bullet">
+        /// <item>A message indicating that the <see cref="VariationCoefficientLogNormalDistribution.Mean"/> for <paramref name="parameterName"/> 
+        /// must be a positive number, when it is NaN or Infinity.</item>
+        /// <item>A message indicating that the <see cref="VariationCoefficientLogNormalDistribution.CoefficientOfVariation"/> 
+        /// for <paramref name="parameterName"/> must be larger or equal to 0, when it is NaN or Infinity.</item>
+        /// </list>
+        /// </returns>
         public static string[] ValidateDistribution(VariationCoefficientLogNormalDistribution distribution, string parameterName)
         {
             var validationResult = new List<string>();
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -r2f20d373b18e86839cee118d7922eb41454af394
--- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2f20d373b18e86839cee118d7922eb41454af394)
@@ -157,6 +157,46 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De variatiecoëfficient voor &apos;{0}&apos; moet groter zijn dan of gelijk zijn aan 0..
+        /// </summary>
+        public static string DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_must_be_larger_or_equal_to_0 {
+            get {
+                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_mu" +
+                        "st_be_larger_or_equal_to_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De verwachtingswaarde voor &apos;{0}&apos; moet een geldig getal zijn..
+        /// </summary>
+        public static string DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_number {
+            get {
+                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_a_valid_numb" +
+                        "er", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De verwachtingswaarde voor &apos;{0}&apos; moet een positief getal zijn..
+        /// </summary>
+        public static string DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_value {
+            get {
+                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_Mean_of_0_must_be_positive_val" +
+                        "ue", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De standaard afwijking voor &apos;{0}&apos; moet groter zijn dan of gelijk zijn aan 0..
+        /// </summary>
+        public static string DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be_larger_or_equal_to_0 {
+            get {
+                return ResourceManager.GetString("DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be" +
+                        "_larger_or_equal_to_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Validatie mislukt: {0}.
         /// </summary>
         public static string Error_in_validation_0 {
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx
===================================================================
diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -r2f20d373b18e86839cee118d7922eb41454af394
--- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 2f20d373b18e86839cee118d7922eb41454af394)
@@ -165,4 +165,16 @@
   <data name="CalculationService_ValidateInput_No_hydraulic_boundary_database_selected" xml:space="preserve">
     <value>Er is geen hydraulische randvoorwaardendatabase geïmporteerd.</value>
   </data>
+  <data name="DistributionValidationService_ValidateDistribution_CoefficientOfVariation_Of_0_must_be_larger_or_equal_to_0" xml:space="preserve">
+    <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>
+  </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>
+  </data>
+  <data name="DistributionValidationService_ValidateDistribution_StandardDeviation_of_0_must_be_larger_or_equal_to_0" xml:space="preserve">
+    <value>De standaard afwijking voor '{0}' moet groter zijn dan of gelijk zijn aan 0.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DistributionValidationServiceTest.cs
===================================================================
diff -u -rd2753c88b67dda711ab593c1d8a45ed472049d81 -r2f20d373b18e86839cee118d7922eb41454af394
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DistributionValidationServiceTest.cs	(.../DistributionValidationServiceTest.cs)	(revision d2753c88b67dda711ab593c1d8a45ed472049d81)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DistributionValidationServiceTest.cs	(.../DistributionValidationServiceTest.cs)	(revision 2f20d373b18e86839cee118d7922eb41454af394)
@@ -158,7 +158,7 @@
         public void ValidateDistribution_InvalidStandardDeviationNormalDistribution_ErrorMessage(double value)
         {
             // Setup 
-            var expectedMessage = string.Format("De standaard afwijking voor '{0}' moet groter zijn dan of gelijk aan 0.", paramName);
+            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
@@ -178,7 +178,7 @@
         public void ValidateDistribution_InvalidStandardDeviationLogNormalDistribution_ErrorMessage(double value)
         {
             // Setup 
-            var expectedMessage = string.Format("De standaard afwijking voor '{0}' moet groter zijn dan of gelijk aan 0.", paramName);
+            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
@@ -198,7 +198,7 @@
         public void ValidateDistribution_InvalidVariationCoefficientNormalDistribution_ErrorMessage(double value)
         {
             // Setup 
-            var expectedMessage = string.Format("De variatiecoëfficient voor '{0}' moet groter zijn dan of gelijk aan 0.", paramName);
+            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
@@ -218,7 +218,7 @@
         public void ValidateDistribution_InvalidVariationCoefficientLogNormalDistribution_ErrorMessage(double value)
         {
             // Setup 
-            var expectedMessage = string.Format("De variatiecoëfficient voor '{0}' moet groter zijn dan of gelijk aan 0.", paramName);
+            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