Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r44cf5bc0f292171637b0c91b74005effe4d2798c
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 44cf5bc0f292171637b0c91b74005effe4d2798c)
@@ -516,7 +516,7 @@
                 CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter(
                     context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath,
                     RingtoetsIntegrationPluginResources.DesignWaterLevel_Description, RingtoetsIntegrationPluginResources.WaveHeight_Description),
-                IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase != null,
+                IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase.IsCoupled(),
                 FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension,
                                                               RingtoetsCommonIOResources.Shape_file_filter_Description)
             };
@@ -654,9 +654,9 @@
             {
                 Text = hydraulicBoundaryDatabase => RingtoetsFormsResources.HydraulicBoundaryDatabase_DisplayName,
                 Image = hydraulicBoundaryDatabase => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase == null
-                                           ? Color.FromKnownColor(KnownColor.GrayText)
-                                           : Color.FromKnownColor(KnownColor.ControlText),
+                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase.IsCoupled()
+                                           ? Color.FromKnownColor(KnownColor.ControlText)
+                                           : Color.FromKnownColor(KnownColor.GrayText),
                 ChildNodeObjects = HydraulicBoundaryDatabaseChildNodeObjects,
                 ContextMenuStrip = HydraulicBoundaryDatabaseContextMenuStrip
             };
@@ -1362,15 +1362,16 @@
 
         private static object[] HydraulicBoundaryDatabaseChildNodeObjects(HydraulicBoundaryDatabaseContext nodeData)
         {
-            if (nodeData.WrappedData.HydraulicBoundaryDatabase == null)
+            if (nodeData.WrappedData.HydraulicBoundaryDatabase.IsCoupled())
             {
-                return new object[0];
+                return new object[]
+                {
+                    new DesignWaterLevelLocationsContext(nodeData.WrappedData),
+                    new WaveHeightLocationsContext(nodeData.WrappedData)
+                };
             }
-            return new object[]
-            {
-                new DesignWaterLevelLocationsContext(nodeData.WrappedData),
-                new WaveHeightLocationsContext(nodeData.WrappedData)
-            };
+
+            return new object[0];
         }
 
         private ContextMenuStrip DesignWaterLevelLocationsContextMenuStrip(DesignWaterLevelLocationsContext nodeData, object parentData, TreeViewControl treeViewControl)
@@ -1509,11 +1510,11 @@
         {
             HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
 
-            bool isHydraulicBoundaryDatabaseSet = hydraulicBoundaryDatabase != null;
-            bool isClearConfirmationRequired = isHydraulicBoundaryDatabaseSet && !HydraulicBoundaryDatabaseHelper.HaveEqualVersion(hydraulicBoundaryDatabase, databaseFile);
+            bool isHydraulicBoundaryDatabaseCoupled = hydraulicBoundaryDatabase.IsCoupled();
+            bool isClearConfirmationRequired = isHydraulicBoundaryDatabaseCoupled && !HydraulicBoundaryDatabaseHelper.HaveEqualVersion(hydraulicBoundaryDatabase, databaseFile);
             bool isClearConfirmationGiven = isClearConfirmationRequired && IsClearCalculationConfirmationGiven();
 
-            if (isHydraulicBoundaryDatabaseSet && isClearConfirmationRequired && !isClearConfirmationGiven)
+            if (isHydraulicBoundaryDatabaseCoupled && isClearConfirmationRequired && !isClearConfirmationGiven)
             {
                 return;
             }