Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf98cc7191a717793f69485dad2923cd34f6d48de -r4cc73327b5db5355b456dc0c51846213ad0ea566
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision f98cc7191a717793f69485dad2923cd34f6d48de)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4cc73327b5db5355b456dc0c51846213ad0ea566)
@@ -285,7 +285,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to HLCD database.
+        ///   Looks up a localized string similar to HR database.
         /// </summary>
         public static string SelectDatabaseFile_FilterName {
             get {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rf98cc7191a717793f69485dad2923cd34f6d48de -r4cc73327b5db5355b456dc0c51846213ad0ea566
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision f98cc7191a717793f69485dad2923cd34f6d48de)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 4cc73327b5db5355b456dc0c51846213ad0ea566)
@@ -209,7 +209,7 @@
     <value>Selecteer database</value>
   </data>
   <data name="SelectDatabaseFile_FilterName" xml:space="preserve">
-    <value>HLCD database</value>
+    <value>HR database</value>
   </data>
   <data name="Delete_ToetsPeil_Calculations_Text" xml:space="preserve">
     <value>Wil je alle toetspeil berekeningen verwijderen?</value>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r249fd5e4604012895724a9d7df67201332c9e7dc -r4cc73327b5db5355b456dc0c51846213ad0ea566
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 249fd5e4604012895724a9d7df67201332c9e7dc)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 4cc73327b5db5355b456dc0c51846213ad0ea566)
@@ -377,20 +377,13 @@
                 RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Connect_ToolTip,
                 RingtoetsCommonFormsResources.DatabaseIcon, (sender, args) => { SelectDatabaseFile(nodeData); });
 
-            var toetsPeilItem = new StrictContextMenuItem(
-                RingtoetsCommonFormsResources.Toetspeil_Calculate,
-                RingtoetsCommonFormsResources.Toetspeil_Calculate_ToolTip,
-                GetFolderIcon(TreeFolderCategory.General), null);
-
             return Gui.Get(nodeData, treeViewControl)
                       .AddOpenItem()
                       .AddSeparator()
                       .AddCustomItem(connectionItem)
                       .AddImportItem()
                       .AddExportItem()
                       .AddSeparator()
-                      .AddCustomItem(toetsPeilItem)
-                      .AddSeparator()
                       .AddPropertiesItem()
                       .Build();
         }
@@ -404,7 +397,7 @@
                 Multiselect = false,
                 Title = windowTitle,
                 RestoreDirectory = true,
-                CheckFileExists = true,
+                CheckFileExists = false,
             })
             {
                 if (dialog.ShowDialog(Gui.MainWindow) == DialogResult.OK)
@@ -468,8 +461,10 @@
                                                string selectedFile,
                                                string newVersion)
         {
-            hydraulicBoundaryLocationsImporter.Import(nodeData.BoundaryDatabase.Locations, selectedFile);
-            SetBoundaryDatabaseData(nodeData, selectedFile, newVersion);
+            if (hydraulicBoundaryLocationsImporter.Import(nodeData.BoundaryDatabase.Locations, selectedFile))
+            {
+                SetBoundaryDatabaseData(nodeData, selectedFile, newVersion);
+            }
         }
 
         private static void SetBoundaryDatabaseData(HydraulicBoundaryDatabaseContext nodeData, string selectedFile, string version)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r29aa042ede5dcb9ef46621475e3810dafb63cd4a -r4cc73327b5db5355b456dc0c51846213ad0ea566
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 29aa042ede5dcb9ef46621475e3810dafb63cd4a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 4cc73327b5db5355b456dc0c51846213ad0ea566)
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.TreeView;
@@ -117,8 +116,6 @@
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);