Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs
===================================================================
diff -u -rf0d42a8ed6e8d6dea6be0323366cc3a37b0fcdc8 -r938a0b339a3c949994a383b4ae429ef4750d3f87
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision f0d42a8ed6e8d6dea6be0323366cc3a37b0fcdc8)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision 938a0b339a3c949994a383b4ae429ef4750d3f87)
@@ -369,7 +369,7 @@
         {
             get
             {
-                Point2D referenceLocation = Structure?.Location;
+                Point2D referenceLocation = data.WrappedData.Structure?.Location;
                 return data.WrappedData.HydraulicBoundaryLocation != null
                            ? new SelectableHydraulicBoundaryLocation(data.WrappedData.HydraulicBoundaryLocation, referenceLocation)
                            : null;
@@ -417,7 +417,7 @@
 
         public IEnumerable<SelectableHydraulicBoundaryLocation> GetSelectableHydraulicBoundaryLocations()
         {
-            Point2D referenceLocation = Structure?.Location;
+            Point2D referenceLocation = data.WrappedData.Structure?.Location;
             return SelectableHydraulicBoundaryLocationHelper.GetSortedSelectableHydraulicBoundaryLocations(
                 data.AvailableHydraulicBoundaryLocations, referenceLocation);
         }