Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs
===================================================================
diff -u -r756064ca162892256021ac1616fe4680b2bba320 -r4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision 756064ca162892256021ac1616fe4680b2bba320)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision 4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb)
@@ -20,12 +20,9 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Xml;
-using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.IO.Configurations;
 using Ringtoets.Common.IO.Configurations.Export;
-using Ringtoets.Piping.Data;
 
 namespace Ringtoets.Piping.IO.Configurations
 {
@@ -53,46 +50,29 @@
             writer.WriteStartElement(ConfigurationSchemaIdentifiers.CalculationElement);
             writer.WriteAttributeString(ConfigurationSchemaIdentifiers.NameAttribute, configuration.Name);
 
-            if (configuration.AssessmentLevel.HasValue)
-            {
-                WriteElementWhenContentAvailable(writer,
-                                                 PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement,
-                                                 configuration.AssessmentLevel);
-            }
-            else
-            {
-                WriteElementWhenContentAvailable(writer,
-                                                 ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement,
-                                                 configuration.HydraulicBoundaryLocation);
-            }
+            WriteElementWhenContentAvailable(writer,
+                                             PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement,
+                                             configuration.AssessmentLevel);
+            WriteElementWhenContentAvailable(writer,
+                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement,
+                                             configuration.HydraulicBoundaryLocation);
 
-            if (configuration.SurfaceLine != null)
-            {
-                WriteElementWhenContentAvailable(writer,
-                                                 PipingCalculationConfigurationSchemaIdentifiers.SurfaceLineElement,
-                                                 configuration.SurfaceLine);
-                WriteElementWhenContentAvailable(writer,
-                                                 PipingCalculationConfigurationSchemaIdentifiers.EntryPointLElement,
-                                                 configuration.EntryPointL);
-                WriteElementWhenContentAvailable(writer,
-                                                 PipingCalculationConfigurationSchemaIdentifiers.ExitPointLElement,
-                                                 configuration.ExitPointL);
-            }
+            WriteElementWhenContentAvailable(writer,
+                                             PipingCalculationConfigurationSchemaIdentifiers.SurfaceLineElement,
+                                             configuration.SurfaceLine);
+            WriteElementWhenContentAvailable(writer,
+                                             PipingCalculationConfigurationSchemaIdentifiers.EntryPointLElement,
+                                             configuration.EntryPointL);
+            WriteElementWhenContentAvailable(writer,
+                                             PipingCalculationConfigurationSchemaIdentifiers.ExitPointLElement,
+                                             configuration.ExitPointL);
+            WriteElementWhenContentAvailable(writer,
+                                             PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilModelElement,
+                                             configuration.StochasticSoilModel);
+            WriteElementWhenContentAvailable(writer,
+                                             PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement,
+                                             configuration.StochasticSoilProfile);
 
-            if (configuration.StochasticSoilModel != null)
-            {
-                WriteElementWhenContentAvailable(writer,
-                                                 PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilModelElement,
-                                                 configuration.StochasticSoilModel);
-
-                if (configuration.StochasticSoilProfile != null)
-                {
-                    WriteElementWhenContentAvailable(writer,
-                                                     PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement,
-                                                     configuration.StochasticSoilProfile);
-                }
-            }
-
             writer.WriteStartElement(ConfigurationSchemaIdentifiers.StochastsElement);
 
             WriteDistributionWhenAvailable(writer,