Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs
===================================================================
diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -114,6 +114,7 @@
             Assert.AreEqual(new RoundedDouble(2), input.BreakWater.Height);
             Assert.IsFalse(input.UseForeshore);
             CollectionAssert.IsEmpty(input.ForeshoreGeometry);
+            Assert.AreEqual(new RoundedDouble(2, double.NaN), input.AssessmentLevel);
             Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryDesignWaterLevel);
             Assert.AreEqual(new RoundedDouble(2, double.NaN), input.LowerBoundaryRevetment);
             Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryRevetment);
@@ -124,6 +125,44 @@
         }
 
         [Test]
+        public void HydraulicBoundaryLocation_SetNewValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelNaN()
+        {
+            // Setup
+            var input = new WaveConditionsInput();
+            var assessmentLevel = 3.2;
+
+            // Call
+            input.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0, 0)
+            {
+                DesignWaterLevel = (RoundedDouble)assessmentLevel
+            };
+
+            // Assert
+            Assert.AreEqual(assessmentLevel, input.AssessmentLevel.Value, input.UpperBoundaryDesignWaterLevel.GetAccuracy());
+            Assert.AreEqual(assessmentLevel - 0.01, input.UpperBoundaryDesignWaterLevel.Value, input.UpperBoundaryDesignWaterLevel.GetAccuracy());
+        }
+
+        [Test]
+        public void HydraulicBoundaryLocation_SetNullValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelNaN()
+        {
+            // Setup
+            var input = new WaveConditionsInput
+            {
+                HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0, 0)
+                {
+                    DesignWaterLevel = (RoundedDouble) 3.2
+                }
+            };
+
+            // Call
+            input.HydraulicBoundaryLocation = null;
+
+            // Assert
+            Assert.IsNaN(input.AssessmentLevel.Value);
+            Assert.IsNaN(input.UpperBoundaryDesignWaterLevel.Value);
+        }
+
+        [Test]
         [Combinatorial]
         public void ForeshoreProfile_SetNewValue_InputSyncedAccordingly(
             [Values(true, false)] bool withBreakWater,