Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs
===================================================================
diff -u -rd6527ad9448575420a1de6a656c92b433d883168 -r6ac4064c752046fd55341d9d9d3d67214e7fd4e1
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs)	(revision d6527ad9448575420a1de6a656c92b433d883168)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs)	(revision 6ac4064c752046fd55341d9d9d3d67214e7fd4e1)
@@ -51,7 +51,9 @@
 
         protected override AssessmentSectionCategoryWaveConditionsCalculationConfiguration ToConfiguration(ICalculation<AssessmentSectionCategoryWaveConditionsInput> calculation)
         {
-            return (AssessmentSectionCategoryWaveConditionsCalculationConfiguration) CreateConfiguration(calculation);
+            var configuration = new AssessmentSectionCategoryWaveConditionsCalculationConfiguration(calculation.Name);
+            SetConfigurationProperties(configuration, calculation);
+            return configuration;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/FailureMechanismCategoryWaveConditionsCalculationConfigurationExporter.cs
===================================================================
diff -u -r0a4dbdf6c5cf212aa86bddc821e81fbf1b1bcf1e -r6ac4064c752046fd55341d9d9d3d67214e7fd4e1
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/FailureMechanismCategoryWaveConditionsCalculationConfigurationExporter.cs	(.../FailureMechanismCategoryWaveConditionsCalculationConfigurationExporter.cs)	(revision 0a4dbdf6c5cf212aa86bddc821e81fbf1b1bcf1e)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/FailureMechanismCategoryWaveConditionsCalculationConfigurationExporter.cs	(.../FailureMechanismCategoryWaveConditionsCalculationConfigurationExporter.cs)	(revision 6ac4064c752046fd55341d9d9d3d67214e7fd4e1)
@@ -51,7 +51,9 @@
 
         protected override FailureMechanismCategoryWaveConditionsCalculationConfiguration ToConfiguration(ICalculation<FailureMechanismCategoryWaveConditionsInput> calculation)
         {
-            return (FailureMechanismCategoryWaveConditionsCalculationConfiguration) CreateConfiguration(calculation);
+            var configuration = new FailureMechanismCategoryWaveConditionsCalculationConfiguration(calculation.Name);
+            SetConfigurationProperties(configuration, calculation);
+            return configuration;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs
===================================================================
diff -u -r7c2668636a6f8ff95d0ebbe41164d26cedcafbd4 -r6ac4064c752046fd55341d9d9d3d67214e7fd4e1
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs	(.../WaveConditionsCalculationConfigurationExporter.cs)	(revision 7c2668636a6f8ff95d0ebbe41164d26cedcafbd4)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs	(.../WaveConditionsCalculationConfigurationExporter.cs)	(revision 6ac4064c752046fd55341d9d9d3d67214e7fd4e1)
@@ -58,26 +58,22 @@
         protected abstract override TWaveConditionsCalculationConfiguration ToConfiguration(TCalculation calculation);
 
         /// <summary>
-        /// Converts a <see cref="WaveConditionsInput"/> to <see cref="WaveConditionsCalculationConfiguration"/>.
+        /// Sets the properties of a <see cref="TCalculation"/> to a <see cref="TWaveConditionsCalculationConfiguration"/>.
         /// </summary>
-        /// <param name="calculation">The calculation to convert.</param>
-        /// <returns>A new <see cref="WaveConditionsCalculationConfiguration"/> with values 
-        /// taken from <paramref name="calculation"/>.</returns>
-        protected WaveConditionsCalculationConfiguration CreateConfiguration(TCalculation calculation)
+        /// <param name="calculationConfiguration">The calculation configuration to set the properties for.</param>
+        /// <param name="calculation">The calculation to get the properties of.</param>
+        protected void SetConfigurationProperties(TWaveConditionsCalculationConfiguration calculationConfiguration, TCalculation calculation)
         {
             WaveConditionsInput input = calculation.InputParameters;
-            var calculationConfiguration = new WaveConditionsCalculationConfiguration(calculation.Name)
-            {
-                HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name,
-                LowerBoundaryRevetment = input.LowerBoundaryRevetment,
-                UpperBoundaryRevetment = input.UpperBoundaryRevetment,
-                LowerBoundaryWaterLevels = input.LowerBoundaryWaterLevels,
-                UpperBoundaryWaterLevels = input.UpperBoundaryWaterLevels,
-                Orientation = input.Orientation,
-                StepSize = (ConfigurationWaveConditionsInputStepSize?) new ConfigurationWaveConditionsInputStepSizeConverter().ConvertFrom(input.StepSize)
-            };
+            calculationConfiguration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name;
+            calculationConfiguration.LowerBoundaryRevetment = input.LowerBoundaryRevetment;
+            calculationConfiguration.UpperBoundaryRevetment = input.UpperBoundaryRevetment;
+            calculationConfiguration.LowerBoundaryWaterLevels = input.LowerBoundaryWaterLevels;
+            calculationConfiguration.UpperBoundaryWaterLevels = input.UpperBoundaryWaterLevels;
+            calculationConfiguration.Orientation = input.Orientation;
+            calculationConfiguration.StepSize = (ConfigurationWaveConditionsInputStepSize?) new ConfigurationWaveConditionsInputStepSizeConverter().ConvertFrom(input.StepSize);
+
             SetConfigurationForeshoreProfileDependendProperties(calculationConfiguration, input);
-            return calculationConfiguration;
         }
 
         private static void SetConfigurationForeshoreProfileDependendProperties(WaveConditionsCalculationConfiguration configuration,