Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -r88b44f34ed4dd17abbc44d54932215754cfd0601
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 88b44f34ed4dd17abbc44d54932215754cfd0601)
@@ -301,25 +301,41 @@
                 }
             };
 
-            yield return new ViewInfo<DesignWaterLevelLocationsContext, IAssessmentSection, DesignWaterLevelLocationsView>
+            yield return new ViewInfo<DesignWaterLevelLocationsContext, IEnumerable<HydraulicBoundaryLocation>, DesignWaterLevelLocationsView>
             {
                 GetViewName = (v, o) => RingtoetsFormsResources.DesignWaterLevelLocationsContext_DisplayName,
-                GetViewData = context => context.WrappedData,
+                GetViewData = context =>
+                {
+                    if (context.WrappedData.HydraulicBoundaryDatabase == null)
+                    {
+                        return null;
+                    }
+                    return context.WrappedData.HydraulicBoundaryDatabase.Locations;
+                },
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 AfterCreate = (view, context) =>
                 {
+                    view.AssessmentSection = context.WrappedData;
                     view.ApplicationSelection = Gui;
                     view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
                 }
             };
 
-            yield return new ViewInfo<WaveHeightLocationsContext, IAssessmentSection, WaveHeightLocationsView>
+            yield return new ViewInfo<WaveHeightLocationsContext, IEnumerable<HydraulicBoundaryLocation>, WaveHeightLocationsView>
             {
                 GetViewName = (v, o) => RingtoetsFormsResources.WaveHeightLocationsContext_DisplayName,
-                GetViewData = context => context.WrappedData,
+                GetViewData = context =>
+                {
+                    if (context.WrappedData.HydraulicBoundaryDatabase == null)
+                    {
+                        return null;
+                    }
+                    return context.WrappedData.HydraulicBoundaryDatabase.Locations;
+                },
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 AfterCreate = (view, context) =>
                 {
+                    view.AssessmentSection = context.WrappedData;
                     view.ApplicationSelection = Gui;
                     view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
                 }