Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs
===================================================================
diff -u -re92b96920abfc1e5463b11f4819e2fb79938d3f8 -r3bee05079e83234250a993db2c284798b8a35b16
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs	(.../PipingInput.cs)	(revision e92b96920abfc1e5463b11f4819e2fb79938d3f8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs	(.../PipingInput.cs)	(revision 3bee05079e83234250a993db2c284798b8a35b16)
@@ -47,7 +47,6 @@
         private RoundedDouble entryPointL;
         private PipingSurfaceLine surfaceLine;
         private RoundedDouble assessmentLevel;
-        private bool useAssessmentLevelManualInput;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PipingInput"/> class.
@@ -79,7 +78,6 @@
             };
 
             assessmentLevel = new RoundedDouble(2, double.NaN);
-            useAssessmentLevelManualInput = false;
         }
 
         /// <summary>
@@ -194,23 +192,8 @@
         /// <summary>
         /// Gets or sets whether the assessment level is manual input for the calculation.
         /// </summary>
-        public bool UseAssessmentLevelManualInput
-        {
-            get
-            {
-                return useAssessmentLevelManualInput;
-            }
-            set
-            {
-                useAssessmentLevelManualInput = value;
+        public bool UseAssessmentLevelManualInput { get; set; }
 
-                if (useAssessmentLevelManualInput)
-                {
-                    HydraulicBoundaryLocation = null;
-                }
-            }
-        }
-
         /// <summary>
         /// Gets the value <c>true</c> if the entry point and exit point of the
         /// instance of <see cref="PipingInput"/> match the entry point and
@@ -236,6 +219,23 @@
         }
 
         /// <summary>
+        /// Gets or sets the outside high water level.
+        /// [m+NAP]
+        /// </summary>
+        /// <remarks>This property is only used for calculations when <see cref="UseAssessmentLevelManualInput"/> is <c>true</c>.</remarks>
+        public RoundedDouble AssessmentLevel
+        {
+            get
+            {
+                return assessmentLevel;
+            }
+            set
+            {
+                assessmentLevel = value.ToPrecision(assessmentLevel.NumberOfDecimalPlaces);
+            }
+        }
+
+        /// <summary>
         /// Applies the entry point and exit point of the <see cref="SurfaceLine"/> to the
         /// parameters of the instance of <see cref="PipingInput"/>.
         /// </summary>
@@ -292,6 +292,7 @@
             {
                 tempExitPointL = localGeometry.ElementAt(exitPointIndex).X;
             }
+
             if (isDifferentPoints && entryPointIndex > -1)
             {
                 tempEntryPointL = localGeometry.ElementAt(entryPointIndex).X;
@@ -317,34 +318,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the outside high water level.
-        /// [m+NAP]
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when the user attempts to set the 
-        /// assessment level while <see cref="UseAssessmentLevelManualInput"/> is <c>false</c>.</exception>
-        public RoundedDouble AssessmentLevel
-        {
-            get
-            {
-                if (!UseAssessmentLevelManualInput)
-                {
-                    return HydraulicBoundaryLocation?.DesignWaterLevel ?? RoundedDouble.NaN;
-                }
-
-                return assessmentLevel;
-            }
-            set
-            {
-                if (!UseAssessmentLevelManualInput)
-                {
-                    throw new InvalidOperationException("UseAssessmentLevelManualInput is false");
-                }
-
-                assessmentLevel = value.ToPrecision(assessmentLevel.NumberOfDecimalPlaces);
-            }
-        }
-
         #region General input parameters
 
         /// <summary>