Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs
===================================================================
diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9a84eac646ba120e685a58839a3d3ad71d077c2e
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision 9a84eac646ba120e685a58839a3d3ad71d077c2e)
@@ -48,8 +48,22 @@
         protected override void WriteCalculation(PipingCalculationConfiguration configuration, XmlWriter writer)
         {
             writer.WriteStartElement(ConfigurationSchemaIdentifiers.CalculationElement);
+
             writer.WriteAttributeString(ConfigurationSchemaIdentifiers.NameAttribute, configuration.Name);
 
+            WriteCalculationElements(writer, configuration);
+
+            writer.WriteEndElement();
+        }
+
+        /// <summary>
+        /// Writes the elements of the <paramref name="configuration"/> in XML format to file.
+        /// </summary>
+        /// <param name="writer">The writer to use for writing.</param>
+        /// <param name="configuration">The calculation configuration to write.</param>
+        /// <exception cref="InvalidOperationException">Thrown when the <paramref name="writer"/> is closed.</exception>
+        private static void WriteCalculationElements(XmlWriter writer, PipingCalculationConfiguration configuration)
+        {
             WriteElementWhenContentAvailable(writer,
                                              PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement,
                                              configuration.AssessmentLevel);
@@ -73,6 +87,19 @@
                                              PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement,
                                              configuration.StochasticSoilProfileName);
 
+            WriteStochasts(writer, configuration);
+
+            WriteScenarioWhenAvailable(writer, configuration.Scenario);
+        }
+
+        /// <summary>
+        /// Writes the stochats elements of the <paramref name="configuration"/> in XML format to file.
+        /// </summary>
+        /// <param name="writer">The writer to use for writing.</param>
+        /// <param name="configuration">The calculation configuration to write.</param>
+        /// <exception cref="InvalidOperationException">Thrown when the <paramref name="writer"/> is closed.</exception>
+        private static void WriteStochasts(XmlWriter writer, PipingCalculationConfiguration configuration)
+        {
             writer.WriteStartElement(ConfigurationSchemaIdentifiers.StochastsElement);
 
             WriteDistributionWhenAvailable(writer,
@@ -84,8 +111,6 @@
                                            configuration.DampingFactorExit);
 
             writer.WriteEndElement();
-
-            writer.WriteEndElement();
         }
     }
 }
\ No newline at end of file