Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -ra77cd7f471b813c6a7218b42844d017fc10fb4ec -r2d656f68a5c217425ddf438761a177739f04c75b
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision a77cd7f471b813c6a7218b42844d017fc10fb4ec)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 2d656f68a5c217425ddf438761a177739f04c75b)
@@ -142,32 +142,36 @@
                     Version = hydraulicBoundaryDatabaseReader.GetVersion()
                 };
 
+                // Locations directory of HLCD location ids and HRD location ids
                 var locationidsDictionary = hydraulicLocationConfigurationDatabaseReader.GetLocationsIdByRegionId(regionId);
+
+                // Prepare query to fetch hrd locations
                 hydraulicBoundaryDatabaseReader.PrepareReadLocation();
                 while (hydraulicBoundaryDatabaseReader.HasNext)
                 {
-                    try
-                    {
-                        HrdLocation hrdLocation = hydraulicBoundaryDatabaseReader.ReadLocation();
+                    HrdLocation hrdLocation = hydraulicBoundaryDatabaseReader.ReadLocation();
 
-                        long locationId;
-                        locationidsDictionary.TryGetValue(hrdLocation.HrdLocationId, out locationId);
-                        var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(locationId, hrdLocation.Name, hrdLocation.LocationX, hrdLocation.LocationY);
+                    long locationId;
+                    locationidsDictionary.TryGetValue(hrdLocation.HrdLocationId, out locationId);
 
-                        hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
-                    }
-                    catch (LineParseException e)
-                    {
-                        HandleException(e);
-                    }
+                    var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(
+                        locationId,
+                        hrdLocation.Name,
+                        hrdLocation.LocationX,
+                        hrdLocation.LocationY);
+                    hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
                 }
                 return hydraulicBoundaryDatabase;
             }
-            catch (CriticalFileReadException e)
+            catch (Exception e)
             {
-                HandleException(e);
+                if (e is LineParseException || e is CriticalFileReadException)
+                {
+                    HandleException(e);
+                    return null;
+                }
+                throw;
             }
-            return null;
         }
 
         private long GetRegionId()