Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -r2cfb940b86cd22d9aafbd1716d86d55425734b97 -rb883e55c8a4b11cc20616910385f283e73661af9
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 2cfb940b86cd22d9aafbd1716d86d55425734b97)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision b883e55c8a4b11cc20616910385f283e73661af9)
@@ -153,25 +153,15 @@
 
         private ReadHydraulicBoundaryDatabase TryReadHydraulicBoundaryDatabase()
         {
-            ReadResult<ReadHydraulicBoundaryDatabase> readHydraulicBoundaryDatabaseResult = ReadHydraulicBoundaryDatabase();
-            
-            if (readHydraulicBoundaryDatabaseResult.CriticalErrorOccurred || Canceled)
-            {
-                return null;
-            }
-
-            return readHydraulicBoundaryDatabaseResult.Items.Single();
-        }
-
-        private ReadResult<ReadHydraulicBoundaryDatabase> ReadHydraulicBoundaryDatabase()
-        {
             NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_Hrd_file, 1, numberOfSteps);
-            
+         
+            ReadResult<ReadHydraulicBoundaryDatabase> readHydraulicBoundaryDatabaseResult;
+
             try
             {
                 using (var reader = new HydraulicBoundaryDatabaseReader(FilePath))
                 {
-                    return new ReadResult<ReadHydraulicBoundaryDatabase>(false)
+                    readHydraulicBoundaryDatabaseResult = new ReadResult<ReadHydraulicBoundaryDatabase>(false)
                     {
                         Items = new[]
                         {
@@ -182,8 +172,15 @@
             }
             catch (Exception e) when (e is CriticalFileReadException || e is LineParseException)
             {
-                return HandleCriticalFileReadError<ReadHydraulicBoundaryDatabase>(e);
+                readHydraulicBoundaryDatabaseResult = HandleCriticalFileReadError<ReadHydraulicBoundaryDatabase>(e);
             }
+            
+            if (readHydraulicBoundaryDatabaseResult.CriticalErrorOccurred || Canceled)
+            {
+                return null;
+            }
+
+            return readHydraulicBoundaryDatabaseResult.Items.Single();
         }
 
         private ReadResult<ReadHydraulicLocationConfigurationDatabase> ReadHydraulicLocationConfigurationDatabase(string hlcdFilePath)