Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
===================================================================
diff -u -r8ba84ca6be21278d394e6763eb202dd8132db92b -ra50f8fe4c13956d52e563e1f9e154f1bd186edad
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs	(.../PipingCalculationEntityReadExtensions.cs)	(revision 8ba84ca6be21278d394e6763eb202dd8132db92b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs	(.../PipingCalculationEntityReadExtensions.cs)	(revision a50f8fe4c13956d52e563e1f9e154f1bd186edad)
@@ -86,20 +86,26 @@
             {
                 inputParameters.SurfaceLine = entity.SurfaceLineEntity.Read(collector);
             }
-            if (entity.HydraulicLocationEntity != null)
+
+            inputParameters.UseAssessmentLevelManualInput = Convert.ToBoolean(entity.UseAssessmentLevelManualInput);
+            if (inputParameters.UseAssessmentLevelManualInput)
             {
-                inputParameters.HydraulicBoundaryLocation = entity.HydraulicLocationEntity.Read(collector);
+                inputParameters.AssessmentLevel = (RoundedDouble)entity.AssessmentLevel.ToNullAsNaN();
             }
             else
             {
-                inputParameters.AssessmentLevel = (RoundedDouble) entity.AssessmentLevel.ToNullAsNaN();
+                if (entity.HydraulicLocationEntity != null)
+                {
+                    inputParameters.HydraulicBoundaryLocation = entity.HydraulicLocationEntity.Read(collector);
+                }
             }
+
             if (entity.StochasticSoilProfileEntity != null)
             {
                 inputParameters.StochasticSoilModel = entity.StochasticSoilProfileEntity.StochasticSoilModelEntity.Read(collector);
                 inputParameters.StochasticSoilProfile = entity.StochasticSoilProfileEntity.Read(collector);
             }
-
+            
             inputParameters.EntryPointL = (RoundedDouble) entity.EntryPointL.ToNullAsNaN();
             inputParameters.ExitPointL = (RoundedDouble) entity.ExitPointL.ToNullAsNaN();
             inputParameters.PhreaticLevelExit.Mean = (RoundedDouble) entity.PhreaticLevelExitMean.ToNullAsNaN();