Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationProperties.cs
===================================================================
diff -u -r0f28eb71a18af127ad376776ebd2cd597a0aa5c5 -r0aa226bd935a658e8447c6828496a4e49418e7fb
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationProperties.cs	(.../DesignWaterLevelLocationProperties.cs)	(revision 0f28eb71a18af127ad376776ebd2cd597a0aa5c5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationProperties.cs	(.../DesignWaterLevelLocationProperties.cs)	(revision 0aa226bd935a658e8447c6828496a4e49418e7fb)
@@ -42,19 +42,22 @@
         /// Creates a new instance of <see cref="DesignWaterLevelLocationProperties"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/>
-        /// is <c>null</c>.</exception>
-        public DesignWaterLevelLocationProperties(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-            : base(hydraulicBoundaryLocation, new ConstructionProperties
-            {
-                IdIndex = 1,
-                NameIndex = 2,
-                LocationIndex = 3,
-                GoverningWindDirectionIndex = 11,
-                StochastsIndex = 12,
-                DurationsIndex = 13,
-                IllustrationPointsIndex = 14
-            }) {}
+        /// <param name="hydraulicBoundaryLocationCalculation">The hydraulic boundary location calculation at stake.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
+        public DesignWaterLevelLocationProperties(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                  HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+            : base(hydraulicBoundaryLocation,
+                   hydraulicBoundaryLocationCalculation,
+                   new ConstructionProperties
+                   {
+                       IdIndex = 1,
+                       NameIndex = 2,
+                       LocationIndex = 3,
+                       GoverningWindDirectionIndex = 11,
+                       StochastsIndex = 12,
+                       DurationsIndex = 13,
+                       IllustrationPointsIndex = 14
+                   }) {}
 
         [PropertyOrder(4)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
@@ -65,7 +68,7 @@
         {
             get
             {
-                return data.DesignWaterLevel;
+                return hydraulicBoundaryLocationCalculation.Output?.Result ?? RoundedDouble.NaN;
             }
         }
 
@@ -78,8 +81,7 @@
         {
             get
             {
-                HydraulicBoundaryLocationOutput output = data.DesignWaterLevelCalculation.Output;
-                return output?.TargetProbability ?? double.NaN;
+                return hydraulicBoundaryLocationCalculation.Output?.TargetProbability ?? double.NaN;
             }
         }
 
@@ -92,8 +94,7 @@
         {
             get
             {
-                HydraulicBoundaryLocationOutput output = data.DesignWaterLevelCalculation.Output;
-                return output?.TargetReliability ?? RoundedDouble.NaN;
+                return hydraulicBoundaryLocationCalculation.Output?.TargetReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -106,8 +107,7 @@
         {
             get
             {
-                HydraulicBoundaryLocationOutput output = data.DesignWaterLevelCalculation.Output;
-                return output?.CalculatedProbability ?? double.NaN;
+                return hydraulicBoundaryLocationCalculation.Output?.CalculatedProbability ?? double.NaN;
             }
         }
 
@@ -120,8 +120,7 @@
         {
             get
             {
-                HydraulicBoundaryLocationOutput output = data.DesignWaterLevelCalculation.Output;
-                return output?.CalculatedReliability ?? RoundedDouble.NaN;
+                return hydraulicBoundaryLocationCalculation.Output?.CalculatedReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -133,7 +132,9 @@
         {
             get
             {
-                return new EnumDisplayWrapper<CalculationConvergence>(data.DesignWaterLevelCalculationConvergence).DisplayName;
+                CalculationConvergence calculationConvergence = hydraulicBoundaryLocationCalculation.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
+
+                return new EnumDisplayWrapper<CalculationConvergence>(calculationConvergence).DisplayName;
             }
         }
 
@@ -145,21 +146,21 @@
         {
             get
             {
-                return data.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated;
+                return hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated;
             }
             set
             {
-                data.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = value;
+                hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = value;
                 data.NotifyObservers();
             }
         }
 
         protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResult()
         {
-            if (data.DesignWaterLevelCalculation.HasOutput
-                && data.DesignWaterLevelCalculation.Output.HasGeneralResult)
+            if (hydraulicBoundaryLocationCalculation.HasOutput
+                && hydraulicBoundaryLocationCalculation.Output.HasGeneralResult)
             {
-                return data.DesignWaterLevelCalculation.Output.GeneralResult;
+                return hydraulicBoundaryLocationCalculation.Output.GeneralResult;
             }
 
             return null;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs
===================================================================
diff -u -re48e9ad9cf53e5de8c4dd076e55b2fd380fe191a -r0aa226bd935a658e8447c6828496a4e49418e7fb
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs	(.../HydraulicBoundaryLocationProperties.cs)	(revision e48e9ad9cf53e5de8c4dd076e55b2fd380fe191a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs	(.../HydraulicBoundaryLocationProperties.cs)	(revision 0aa226bd935a658e8447c6828496a4e49418e7fb)
@@ -50,8 +50,7 @@
         /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location.</param>
         /// <param name="hydraulicBoundaryLocationCalculation">The hydraulic boundary location calculation at stake.</param>
         /// <param name="propertyIndexes">The <see cref="ConstructionProperties"/> containing the property indices.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/>
-        /// or <paramref name="propertyIndexes"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         protected HydraulicBoundaryLocationProperties(HydraulicBoundaryLocation hydraulicBoundaryLocation,
                                                       HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
                                                       ConstructionProperties propertyIndexes)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs
===================================================================
diff -u -re48e9ad9cf53e5de8c4dd076e55b2fd380fe191a -r0aa226bd935a658e8447c6828496a4e49418e7fb
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs	(.../HydraulicBoundaryLocationPropertiesTest.cs)	(revision e48e9ad9cf53e5de8c4dd076e55b2fd380fe191a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs	(.../HydraulicBoundaryLocationPropertiesTest.cs)	(revision 0aa226bd935a658e8447c6828496a4e49418e7fb)
@@ -252,6 +252,7 @@
             // Call
             var hydraulicBoundaryLocationProperties = new TestHydraulicBoundaryLocationProperties(
                 hydraulicBoundaryLocation,
+                new HydraulicBoundaryLocationCalculation(),
                 new HydraulicBoundaryLocationProperties.ConstructionProperties
                 {
                     IllustrationPointsIndex = 1,
@@ -302,6 +303,11 @@
         {
             public GeneralResult<TopLevelSubMechanismIllustrationPoint> GeneralResult;
 
+            public TestHydraulicBoundaryLocationProperties(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+                : base(hydraulicBoundaryLocation,
+                       new HydraulicBoundaryLocationCalculation(),
+                       new ConstructionProperties()) {}
+
             public TestHydraulicBoundaryLocationProperties(HydraulicBoundaryLocation hydraulicBoundaryLocation,
                                                            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
                 : base(hydraulicBoundaryLocation,