Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -rbe8c50b3fa0529fda1fe17ddeae50055f958a0bd -r1ce62a05fe624df22af3f1d83288457ec163dabc
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision be8c50b3fa0529fda1fe17ddeae50055f958a0bd)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision 1ce62a05fe624df22af3f1d83288457ec163dabc)
@@ -201,13 +201,18 @@
             }
             set
             {
-                if (double.IsNaN(value.DesignWaterLevel))
+                try
                 {
-                    string message = string.Format(Resources.PipingInputContextProperties_HydraulicBoundaryLocation_No_design_water_level_calculated, value.Name);
+                    data.WrappedData.AssessmentLevel = value.DesignWaterLevel;
+                }
+                catch (ArgumentException e)
+                {
+                    string message = string.Format(Resources.PipingInputContextProperties_HydraulicBoundaryLocation_Could_not_set_location_0_cause_1_, 
+                        value.Name,
+                        e.Message);
                     throw new ArgumentException(message);
                 }
                 data.WrappedData.HydraulicBoundaryLocation = value;
-                data.WrappedData.AssessmentLevel = value.DesignWaterLevel;
                 data.WrappedData.NotifyObservers();
             }
         }