Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs
===================================================================
diff -u -r9a84eac646ba120e685a58839a3d3ad71d077c2e -rb518a61a87335ee85085ef4a35d4c54d229ae382
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs	(.../PipingCalculationConfigurationExporter.cs)	(revision 9a84eac646ba120e685a58839a3d3ad71d077c2e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs	(.../PipingCalculationConfigurationExporter.cs)	(revision b518a61a87335ee85085ef4a35d4c54d229ae382)
@@ -56,20 +56,22 @@
         {
             PipingInput input = calculation.InputParameters;
 
-            var calculationConfiguration = new PipingCalculationConfiguration(calculation.Name);
+            var calculationConfiguration = new PipingCalculationConfiguration(calculation.Name)
+            {
+                DampingFactorExit = input.DampingFactorExit.ToStochastConfiguration(),
+                PhreaticLevelExit = input.PhreaticLevelExit.ToStochastConfiguration(),
+                Scenario = calculation.ToScenarioConfiguration()
+            };
 
             if (input.HydraulicBoundaryLocation != null)
             {
-                calculationConfiguration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation.Name;
+                calculationConfiguration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name;
             }
             else if (input.UseAssessmentLevelManualInput)
             {
                 calculationConfiguration.AssessmentLevel = input.AssessmentLevel;
             }
 
-            calculationConfiguration.DampingFactorExit = input.DampingFactorExit.ToStochastConfiguration();
-            calculationConfiguration.PhreaticLevelExit = input.PhreaticLevelExit.ToStochastConfiguration();
-
             if (input.SurfaceLine != null)
             {
                 calculationConfiguration.SurfaceLineName = input.SurfaceLine.Name;
@@ -83,8 +85,6 @@
                 calculationConfiguration.StochasticSoilProfileName = input.StochasticSoilProfile?.SoilProfile.Name;
             }
 
-            calculationConfiguration.Scenario = calculation.ToScenarioConfiguration();
-
             return calculationConfiguration;
         }
     }