Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs
===================================================================
diff -u -r756064ca162892256021ac1616fe4680b2bba320 -r4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs	(.../PipingCalculationConfigurationExporter.cs)	(revision 756064ca162892256021ac1616fe4680b2bba320)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs	(.../PipingCalculationConfigurationExporter.cs)	(revision 4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb)
@@ -51,18 +51,34 @@
         {
             PipingInput input = calculation.InputParameters;
 
-            return new PipingCalculationConfiguration(calculation.Name)
+            var calculationConfiguration = new PipingCalculationConfiguration(calculation.Name);
+
+            if (input.HydraulicBoundaryLocation != null)
             {
-                HydraulicBoundaryLocation = input.HydraulicBoundaryLocation?.Name,
-                AssessmentLevel = input.HydraulicBoundaryLocation == null ? input.AssessmentLevel : (double?)null,
-                DampingFactorExit = input.DampingFactorExit.ToStochastConfiguration(),
-                PhreaticLevelExit = input.PhreaticLevelExit.ToStochastConfiguration(),
-                SurfaceLine = input.SurfaceLine?.Name,
-                EntryPointL = input.EntryPointL,
-                ExitPointL = input.ExitPointL,
-                StochasticSoilModel = input.StochasticSoilModel?.Name,
-                StochasticSoilProfile = input.StochasticSoilProfile?.SoilProfile.Name
-            };
+                calculationConfiguration.HydraulicBoundaryLocation = 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.SurfaceLine = input.SurfaceLine.Name;
+                calculationConfiguration.EntryPointL = input.EntryPointL;
+                calculationConfiguration.ExitPointL = input.ExitPointL;
+            }
+
+            if (input.StochasticSoilModel != null)
+            {
+                calculationConfiguration.StochasticSoilModel = input.StochasticSoilModel.Name;
+                calculationConfiguration.StochasticSoilProfile = input.StochasticSoilProfile?.SoilProfile.Name;
+            }
+
+            return calculationConfiguration;
         }
     }
 }
\ No newline at end of file