Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rfe7c27dc926b4087fd6ed9551655d0571c8018c9 -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision fe7c27dc926b4087fd6ed9551655d0571c8018c9)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -24,7 +24,6 @@
 using Core.Common.Base.Data;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.IO.Configurations.Helpers;
-using Ringtoets.ClosingStructures.IO.Properties;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
@@ -205,7 +204,7 @@
             if (configuration.DrainCoefficient?.StandardDeviation != null
                 || configuration.DrainCoefficient?.VariationCoefficient != null)
             {
-                Log.LogCalculationConversionError(Resources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient,
+                Log.LogCalculationConversionError(RingtoetsCommonIOResources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient,
                                                   configuration.Name);
                 return false;
             }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r4e27904f8aee7ae9723f57336764c585a3b9300d -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4e27904f8aee7ae9723f57336764c585a3b9300d)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -82,16 +82,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Er kan geen spreiding voor stochast &apos;afvoercoefficient&apos; opgegeven worden..
-        /// </summary>
-        internal static string CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient {
-            get {
-                return ResourceManager.GetString("CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_Drain" +
-                        "Coefficient", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
         ///&lt;!--
         ///Copyright (C) Stichting Deltares 2016. All rights reserved.
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Properties/Resources.resx
===================================================================
diff -u -r4e27904f8aee7ae9723f57336764c585a3b9300d -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 4e27904f8aee7ae9723f57336764c585a3b9300d)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Properties/Resources.resx	(.../Resources.resx)	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient" xml:space="preserve">
-    <value>Er kan geen spreiding voor stochast 'afvoercoefficient' opgegeven worden.</value>
-  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="KunstwerkenBetrouwbaarheidSluitenSchema" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\KunstwerkenBetrouwbaarheidSluitenSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r36b8629b18443a58866edc869420795588eaf168 -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 36b8629b18443a58866edc869420795588eaf168)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -255,6 +255,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Er kan geen spreiding voor stochast &apos;afvoercoefficient&apos; opgegeven worden..
+        /// </summary>
+        public static string CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient {
+            get {
+                return ResourceManager.GetString("CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_Drain" +
+                        "Coefficient", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Er kan geen spreiding voor stochast &apos;modelfactoroverloopdebiet&apos; opgegeven worden..
         /// </summary>
         public static string CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_ModelFactorSuperCriticalFlow {
@@ -937,7 +947,7 @@
         
         /// <summary>
         ///   Looks up a localized string similar to TRAJECT_ID;N
-        ///1-1;3
+        ///1-1;Duin
         ///1-2;2
         ///2-1;Duin
         ///2-2;2
@@ -998,8 +1008,7 @@
         ///15-2;2
         ///15-3;2
         ///16-1;1
-        ///16-2;2
-        /// [rest of string was truncated]&quot;;.
+        ///16-2; [rest of string was truncated]&quot;;.
         /// </summary>
         public static string IHW_filecontents {
             get {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -r36b8629b18443a58866edc869420795588eaf168 -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 36b8629b18443a58866edc869420795588eaf168)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -640,4 +640,7 @@
   <data name="CalculationConfigurationImporter_TryReadVariationCoefficientStochast_Stochast_0_requires_variation_coefficient_but_standard_deviation_found_for_Calculation_1_" xml:space="preserve">
     <value>Indien voor parameter '{0}' de spreiding wordt opgegeven, moet dit door middel van een variatiecoëfficiënt. Voor berekening '{1}' is een standaardafwijking gevonden.</value>
   </data>
+  <data name="CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient" xml:space="preserve">
+    <value>Er kan geen spreiding voor stochast 'afvoercoefficient' opgegeven worden.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r3ca074d78bf75ff67c19539c04be91196a0659b0 -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs	(.../StabilityPointStructuresCalculationConfigurationImporter.cs)	(revision 3ca074d78bf75ff67c19539c04be91196a0659b0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs	(.../StabilityPointStructuresCalculationConfigurationImporter.cs)	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -175,53 +175,51 @@
             if (configuration.DrainCoefficient?.StandardDeviation != null
                 || configuration.DrainCoefficient?.VariationCoefficient != null)
             {
-                Log.LogCalculationConversionError("Er kan geen spreiding voor stochast 'afvoercoefficient' opgegeven worden.",
+                Log.LogCalculationConversionError(RingtoetsCommonIOResources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient,
                                                   configuration.Name);
                 return false;
             }
             return true;
         }
 
         /// <summary>
-        /// Reads the orientation.
+        /// Reads the structure normal orientation.
         /// </summary>
         /// <param name="readCalculation">The calculation read from the imported file.</param>
         /// <param name="calculation">The calculation to configure.</param>
         /// <returns><c>false</c> when the orientation is invalid or when there is an orientation but
         /// no structure defined, <c>true</c> otherwise.</returns>
         private bool TryReadOrientation(StructuresCalculationConfiguration readCalculation, StructuresCalculation<StabilityPointStructuresInput> calculation)
         {
-            if (!readCalculation.StructureNormalOrientation.HasValue)
+            if (readCalculation.StructureNormalOrientation.HasValue)
             {
-                return true;
-            }
+                if (calculation.InputParameters.Structure == null)
+                {
+                    Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+                                                                    RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
+                                                      calculation.Name);
 
-            if (calculation.InputParameters.Structure == null)
-            {
-                Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
-                                                                RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
-                                                  calculation.Name);
+                    return false;
+                }
 
-                return false;
-            }
+                double orientation = readCalculation.StructureNormalOrientation.Value;
 
-            double orientation = readCalculation.StructureNormalOrientation.Value;
+                try
+                {
+                    calculation.InputParameters.StructureNormalOrientation = (RoundedDouble) orientation;
+                }
+                catch (ArgumentOutOfRangeException e)
+                {
+                    Log.LogOutOfRangeException(string.Format(RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+                                                             orientation,
+                                                             RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
+                                               calculation.Name,
+                                               e);
 
-            try
-            {
-                calculation.InputParameters.StructureNormalOrientation = (RoundedDouble) orientation;
+                    return false;
+                }
             }
-            catch (ArgumentOutOfRangeException e)
-            {
-                Log.LogOutOfRangeException(string.Format(RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
-                                                         orientation,
-                                                         RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
-                                           calculation.Name,
-                                           e);
 
-                return false;
-            }
-
             return true;
         }
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r3ca074d78bf75ff67c19539c04be91196a0659b0 -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs	(.../StabilityPointStructuresCalculationConfigurationImporterTest.cs)	(revision 3ca074d78bf75ff67c19539c04be91196a0659b0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs	(.../StabilityPointStructuresCalculationConfigurationImporterTest.cs)	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -48,11 +48,33 @@
             get
             {
                 yield return new TestCaseData(
+                    "validConfigurationDrainCoefficientStandardDeviation.xml",
+                    "Er kan geen spreiding voor stochast 'afvoercoefficient' opgegeven worden.");
+                yield return new TestCaseData(
+                    "validConfigurationDrainCoefficientVariationCoefficient.xml",
+                    "Er kan geen spreiding voor stochast 'afvoercoefficient' opgegeven worden.");
+
+                yield return new TestCaseData(
                     "validConfigurationInvalidFailureProbabilityStructureErosion.xml",
                     "Een waarde van '1,1' als faalkans gegeven erosie bodem is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.");
+
                 yield return new TestCaseData(
+                    "validConfigurationFailureProbabilityRepairClosureWithoutStructure.xml",
+                    "Er is geen kunstwerk opgegeven om faalkans herstel van gefaalde situatie aan toe te voegen.");
+                yield return new TestCaseData(
                     "validConfigurationInvalidFailureProbabilityRepairClosureElement.xml",
                     "Een waarde van '1,1' als faalkans herstel van gefaalde situatie is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.");
+
+                yield return new TestCaseData(
+                    "validConfigurationInflowModelTypeWithoutStructure.xml",
+                    "Er is geen kunstwerk opgegeven om instroommodel aan toe te voegen.");
+
+                yield return new TestCaseData(
+                    "validConfigurationStructureNormalOrientationWithoutStructure.xml",
+                    "Er is geen kunstwerk opgegeven om oriëntatie aan toe te voegen.");
+                yield return new TestCaseData(
+                    "validConfigurationInvalidStructureNormalOrientation.xml",
+                    "Een waarde van '-12' als oriëntatie is ongeldig. De waarde voor de oriëntatie moet in het bereik [0,00, 360,00] liggen.");
             }
         }
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationDrainCoefficientStandardDeviation.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationDrainCoefficientStandardDeviation.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationDrainCoefficientStandardDeviation.xml	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <kunstwerk>kunstwerk1</kunstwerk>
+    <stochasten>
+      <stochast naam="afvoercoefficient">
+        <standaardafwijking>0.1</standaardafwijking>
+      </stochast>
+    </stochasten>
+  </berekening>
+</configuratie>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationDrainCoefficientVariationCoefficient.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationDrainCoefficientVariationCoefficient.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationDrainCoefficientVariationCoefficient.xml	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <kunstwerk>kunstwerk1</kunstwerk>
+    <stochasten>
+      <stochast naam="afvoercoefficient">
+        <variatiecoefficient>0.21</variatiecoefficient>
+      </stochast>
+    </stochasten>
+  </berekening>
+</configuratie>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityRepairClosureWithoutStructure.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityRepairClosureWithoutStructure.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityRepairClosureWithoutStructure.xml	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <faalkansherstel>0.001</faalkansherstel>
+  </berekening>
+</configuratie>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInflowModelTypeWithoutStructure.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInflowModelTypeWithoutStructure.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInflowModelTypeWithoutStructure.xml	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <instroommodel>verdronkenkoker</instroommodel>
+  </berekening>
+</configuratie>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidStructureNormalOrientation.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidStructureNormalOrientation.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidStructureNormalOrientation.xml	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <kunstwerk>kunstwerk1</kunstwerk>
+    <orientatie>-12</orientatie>
+  </berekening>
+</configuratie>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationStructureNormalOrientationWithoutStructure.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationStructureNormalOrientationWithoutStructure.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationStructureNormalOrientationWithoutStructure.xml	(revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <orientatie>67.1</orientatie>
+  </berekening>
+</configuratie>