Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r5b07686bb3f89f1fa1017c4bf2cf8964ae9bd95c -r562b4d8e37190d011089b77ddb28912e004bfdd9
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5b07686bb3f89f1fa1017c4bf2cf8964ae9bd95c)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 562b4d8e37190d011089b77ddb28912e004bfdd9)
@@ -172,9 +172,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Het XML-document dat de configuratie voor de berekeningen beschrijft is niet geldig. De validatie geeft de volgende melding: {0}.
         /// </summary>
-        public static string CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0 {
+        public static string CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0_ {
             get {
-                return ResourceManager.GetString("CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0", resourceCulture);
+                return ResourceManager.GetString("CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0_", resourceCulture);
             }
         }
         
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -r5b07686bb3f89f1fa1017c4bf2cf8964ae9bd95c -r562b4d8e37190d011089b77ddb28912e004bfdd9
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 5b07686bb3f89f1fa1017c4bf2cf8964ae9bd95c)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 562b4d8e37190d011089b77ddb28912e004bfdd9)
@@ -562,7 +562,7 @@
   <data name="Importer_LogMessageText_Update_of_TypeDescriptor_0_cancelled" xml:space="preserve">
     <value>{0} bijwerken afgebroken. Geen data ingelezen.</value>
   </data>
-  <data name="CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0" xml:space="preserve">
+  <data name="CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0_" xml:space="preserve">
     <value>Het XML-document dat de configuratie voor de berekeningen beschrijft is niet geldig. De validatie geeft de volgende melding: {0}</value>
   </data>
   <data name="IDistributionExtensions_TrySetMean_Mean_0_is_invalid_for_Stochast_1_" xml:space="preserve">
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs
===================================================================
diff -u -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 -r562b4d8e37190d011089b77ddb28912e004bfdd9
--- Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs	(.../CalculationConfigurationReader.cs)	(revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs	(.../CalculationConfigurationReader.cs)	(revision 562b4d8e37190d011089b77ddb28912e004bfdd9)
@@ -138,7 +138,7 @@
             }
             catch (XmlException exception)
             {
-                string exceptionMessage = string.Format(Resources.CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0,
+                string exceptionMessage = string.Format(Resources.CalculationConfigurationReader_Configuration_contains_no_valid_xml_Reason_0_,
                                                         exception.Message);
 
                 throw new CriticalFileReadException(new FileReaderErrorMessageBuilder(xmlFilePath).Build(exceptionMessage), exception);
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r82db5c5ee21fae9e20fee1412dbb29b1c47b038a -r562b4d8e37190d011089b77ddb28912e004bfdd9
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 82db5c5ee21fae9e20fee1412dbb29b1c47b038a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 562b4d8e37190d011089b77ddb28912e004bfdd9)
@@ -19,9 +19,10 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
-using Ringtoets.Common.IO;
+using Core.Common.Base.IO;
 using Ringtoets.Common.IO.Configurations;
 using Ringtoets.Common.IO.Configurations.Helpers;
 using Ringtoets.Common.IO.Readers;
@@ -31,6 +32,10 @@
 
 namespace Ringtoets.HeightStructures.IO
 {
+    /// <summary>
+    /// Reader for reading a height structure calculation configuration from XML and creating a collection 
+    /// of corresponding <see cref="HeightStructuresCalculationConfiguration"/>.
+    /// </summary>
     public class HeightStructuresCalculationConfigurationReader : CalculationConfigurationReader<HeightStructuresCalculationConfiguration>
     {
         private const string hrLocatieSchemaName = "HrLocatieSchema.xsd";
@@ -42,6 +47,19 @@
         private const string stochastVariatiecoefficientSchemaName = "StochastVariatiecoefficientSchema.xsd";
         private const string structureBaseSchemaName = "KunstwerkenBasisSchema.xsd";
 
+        /// <summary>
+        /// Creates a new instance of <see cref="HeightStructuresCalculationConfigurationReader"/>.
+        /// </summary>
+        /// <param name="filePath">The file path to the XML file.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="filePath"/> is invalid.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when:
+        /// <list type="bullet">
+        /// <item><paramref name="filePath"/> points to a file that does not exist.</item>
+        /// <item><paramref name="filePath"/> points to a file that does not contain valid XML.</item>
+        /// <item><paramref name="filePath"/> points to a file that does not pass the schema validation.</item>
+        /// <item><paramref name="filePath"/> points to a file that does not contain configuration elements.</item>
+        /// </list>
+        /// </exception>
         public HeightStructuresCalculationConfigurationReader(string filePath)
             : base(filePath,
                    Resources.KunstwerkenHoogteSchema,
@@ -98,7 +116,7 @@
             return configuration;
         }
 
-        private WaveReductionConfiguration GetWaveReductionParameters(XElement calculationElement)
+        private static WaveReductionConfiguration GetWaveReductionParameters(XElement calculationElement)
         {
             XElement waveReduction = calculationElement.GetDescendantElement(ConfigurationSchemaIdentifiers.WaveReduction);
             if (waveReduction != null)