Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r5f489223b4d730eec42acd55533dd012d10dd1ca -rb574376e8d2b485ff320504841723923c1e41331
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision 5f489223b4d730eec42acd55533dd012d10dd1ca)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision b574376e8d2b485ff320504841723923c1e41331)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base.Data;
-using log4net;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.IO.Configurations.Helpers;
 using Ringtoets.ClosingStructures.IO.Properties;
@@ -130,79 +129,76 @@
             }
 
             return TryReadStandardDeviationStochast(
-                       calculation.Name,
                        ClosingStructuresConfigurationSchemaIdentifiers.LevelCrestStructureNotClosingStochastName,
+                       calculation.Name,
                        calculation.InputParameters,
                        readCalculation.LevelCrestStructureNotClosing,
-                       i => i.LevelCrestStructureNotClosing,
-                       (i, d) => i.LevelCrestStructureNotClosing = d)
+                       i => i.LevelCrestStructureNotClosing, (i, d) => i.LevelCrestStructureNotClosing = d)
                    && TryReadStandardDeviationStochast(
-                       calculation.Name,
                        ClosingStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName,
-                       calculation.InputParameters, readCalculation.AreaFlowApertures,
-                       i => i.AreaFlowApertures,
-                       (i, d) => i.AreaFlowApertures = d)
-                   && TryReadStandardDeviationStochast(
                        calculation.Name,
-                       ClosingStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
-                       calculation.InputParameters, readCalculation.DrainCoefficient,
-                       i => i.DrainCoefficient,
-                       (i, d) => i.DrainCoefficient = d)
+                       calculation.InputParameters,
+                       readCalculation.AreaFlowApertures,
+                       i => i.AreaFlowApertures, (i, d) => i.AreaFlowApertures = d)
                    && TryReadStandardDeviationStochast(
+                       ClosingStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
                        calculation.Name,
-                       ClosingStructuresConfigurationSchemaIdentifiers.InsideWaterLevelStochastName,
-                       calculation.InputParameters, readCalculation.InsideWaterLevel,
-                       i => i.InsideWaterLevel,
-                       (i, d) => i.InsideWaterLevel = d)
+                       calculation.InputParameters,
+                       readCalculation.DrainCoefficient,
+                       i => i.DrainCoefficient, (i, d) => i.DrainCoefficient = d)
                    && TryReadStandardDeviationStochast(
+                       ClosingStructuresConfigurationSchemaIdentifiers.InsideWaterLevelStochastName,
                        calculation.Name,
-                       ClosingStructuresConfigurationSchemaIdentifiers.ThresholdHeightOpenWeirStochastName,
-                       calculation.InputParameters, readCalculation.ThresholdHeightOpenWeir,
-                       i => i.ThresholdHeightOpenWeir,
-                       (i, d) => i.ThresholdHeightOpenWeir = d)
+                       calculation.InputParameters,
+                       readCalculation.InsideWaterLevel,
+                       i => i.InsideWaterLevel, (i, d) => i.InsideWaterLevel = d)
                    && TryReadStandardDeviationStochast(
+                       ClosingStructuresConfigurationSchemaIdentifiers.ThresholdHeightOpenWeirStochastName,
                        calculation.Name,
-                       ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
-                       calculation.InputParameters, readCalculation.AllowedLevelIncreaseStorage,
-                       i => i.AllowedLevelIncreaseStorage,
-                       (i, d) => i.AllowedLevelIncreaseStorage = d)
+                       calculation.InputParameters,
+                       readCalculation.ThresholdHeightOpenWeir,
+                       i => i.ThresholdHeightOpenWeir, (i, d) => i.ThresholdHeightOpenWeir = d)
                    && TryReadStandardDeviationStochast(
+                       ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
                        calculation.Name,
-                       ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
-                       calculation.InputParameters, readCalculation.FlowWidthAtBottomProtection,
-                       i => i.FlowWidthAtBottomProtection,
-                       (i, d) => i.FlowWidthAtBottomProtection = d)
+                       calculation.InputParameters,
+                       readCalculation.AllowedLevelIncreaseStorage,
+                       i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d)
                    && TryReadStandardDeviationStochast(
+                       ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
                        calculation.Name,
-                       ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
-                       calculation.InputParameters, readCalculation.ModelFactorSuperCriticalFlow,
-                       i => i.ModelFactorSuperCriticalFlow,
-                       (i, d) => i.ModelFactorSuperCriticalFlow = d)
+                       calculation.InputParameters,
+                       readCalculation.FlowWidthAtBottomProtection,
+                       i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d)
                    && TryReadStandardDeviationStochast(
+                       ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
                        calculation.Name,
+                       calculation.InputParameters,
+                       readCalculation.ModelFactorSuperCriticalFlow,
+                       i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d)
+                   && TryReadStandardDeviationStochast(
                        ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName,
-                       calculation.InputParameters, readCalculation.WidthFlowApertures,
-                       i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
-                   && TryReadVariationCoefficientStochast(
                        calculation.Name,
-                       ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
-                       calculation.InputParameters, readCalculation.CriticalOvertoppingDischarge,
-                       i => i.CriticalOvertoppingDischarge,
-                       (i, d) => i.CriticalOvertoppingDischarge = d)
+                       calculation.InputParameters,
+                       readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
                    && TryReadVariationCoefficientStochast(
+                       ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
                        calculation.Name,
+                       calculation.InputParameters,
+                       readCalculation.CriticalOvertoppingDischarge,
+                       i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d)
+                   && TryReadVariationCoefficientStochast(
                        ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName,
+                       calculation.Name,
                        calculation.InputParameters,
                        readCalculation.StorageStructureArea,
-                       i => i.StorageStructureArea,
-                       (i, d) => i.StorageStructureArea = d)
+                       i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d)
                    && TryReadVariationCoefficientStochast(
-                       calculation.Name,
                        ConfigurationSchemaIdentifiers.StormDurationStochastName,
+                       calculation.Name,
                        calculation.InputParameters,
                        readCalculation.StormDuration,
-                       i => i.StormDuration,
-                       (i, d) => i.StormDuration = d);
+                       i => i.StormDuration, (i, d) => i.StormDuration = d);
         }
 
         private bool ValidateStochasts(ClosingStructuresCalculationConfiguration configuration)