Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs
===================================================================
diff -u -rd5c512944b347df57c08bb0b281c9b764abe4a36 -r5ab32db1a416e8182bb75b48918d7726baced83c
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision d5c512944b347df57c08bb0b281c9b764abe4a36)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision 5ab32db1a416e8182bb75b48918d7726baced83c)
@@ -46,7 +46,7 @@
         {
             get
             {
-                return data.Parent.HydraulicBoundaryDatabase.FilePath;
+                return data.Parent.HydraulicBoundaryDatabase != null ? data.Parent.HydraulicBoundaryDatabase.FilePath : string.Empty;
             }
         }
 
@@ -61,7 +61,9 @@
         {
             get
             {
-                return data.Parent.HydraulicBoundaryDatabase.Locations.Select(loc => new HydraulicBoundaryLocationProperties(loc)).ToArray();
+                return data.Parent.HydraulicBoundaryDatabase != null
+                           ? data.Parent.HydraulicBoundaryDatabase.Locations.Select(loc => new HydraulicBoundaryLocationProperties(loc)).ToArray()
+                           : new HydraulicBoundaryLocationProperties[0];
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r06f9145d8180df7fd26eac086a3f431c181e4d64 -r5ab32db1a416e8182bb75b48918d7726baced83c
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 06f9145d8180df7fd26eac086a3f431c181e4d64)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 5ab32db1a416e8182bb75b48918d7726baced83c)
@@ -436,16 +436,17 @@
         {
             var hydraulicBoundaryLocationsImporter = new HydraulicBoundaryLocationsImporter();
 
-            if (nodeData.Parent.HydraulicBoundaryDatabase == null)
-            {
-                ImportSelectedFile(nodeData, hydraulicBoundaryLocationsImporter, selectedFile);
-                return;
-            }
-
             string newVersion;
             try
             {
                 hydraulicBoundaryLocationsImporter.ValidateAndConnectTo(selectedFile);
+
+                if (nodeData.Parent.HydraulicBoundaryDatabase == null)
+                {
+                    ImportSelectedFile(nodeData, hydraulicBoundaryLocationsImporter, selectedFile);
+                    return;
+                }
+
                 newVersion = hydraulicBoundaryLocationsImporter.GetHydraulicBoundaryDatabaseVersion();
             }
             catch (CriticalFileReadException exception)