Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs
===================================================================
diff -u -ref881721312166028ed88eaa21dfd1ee8a5cbba4 -rb518a61a87335ee85085ef4a35d4c54d229ae382
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs	(.../HeightStructuresCalculationConfigurationExporter.cs)	(revision ef881721312166028ed88eaa21dfd1ee8a5cbba4)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs	(.../HeightStructuresCalculationConfigurationExporter.cs)	(revision b518a61a87335ee85085ef4a35d4c54d229ae382)
@@ -51,15 +51,16 @@
         protected override HeightStructuresCalculationConfiguration ToConfiguration(StructuresCalculation<HeightStructuresInput> calculation)
         {
             HeightStructuresInput input = calculation.InputParameters;
-            var calculationConfiguration = new HeightStructuresCalculationConfiguration(calculation.Name);
-
-            calculationConfiguration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name;
-
-            if (input.ShouldIllustrationPointsBeCalculated)
+            var calculationConfiguration = new HeightStructuresCalculationConfiguration(calculation.Name)
             {
-                calculationConfiguration.ShouldIllustrationPointsBeCalculated = input.ShouldIllustrationPointsBeCalculated;
-            }
+                HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name,
+                ShouldIllustrationPointsBeCalculated = input.ShouldIllustrationPointsBeCalculated,
+                StormDuration = input.StormDuration.ToStochastConfigurationWithMean(),
+                ModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow.ToStochastConfigurationWithMean()
+            };
 
+            calculationConfiguration.SetConfigurationForeshoreProfileDependendProperties(input);
+
             if (input.Structure != null)
             {
                 calculationConfiguration.StructureId = input.Structure.Id;
@@ -73,12 +74,6 @@
                 calculationConfiguration.LevelCrestStructure = input.LevelCrestStructure.ToStochastConfiguration();
                 calculationConfiguration.CriticalOvertoppingDischarge = input.CriticalOvertoppingDischarge.ToStochastConfiguration();
             }
-
-            calculationConfiguration.SetConfigurationForeshoreProfileDependendProperties(input);
-
-            calculationConfiguration.StormDuration = input.StormDuration.ToStochastConfigurationWithMean();
-            calculationConfiguration.ModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow.ToStochastConfigurationWithMean();
-
             return calculationConfiguration;
         }