Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -re2892835ceb1c916be9a9122ba372858f20b981a -r3147d2f42ddbf18f08e0015f71aeeec2de60dd89
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision e2892835ceb1c916be9a9122ba372858f20b981a)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 3147d2f42ddbf18f08e0015f71aeeec2de60dd89)
@@ -172,7 +172,7 @@
                 bool canUsePreprocessor = hydraulicLocationConfigurationDatabaseReader.GetCanUsePreprocessorByTrackId(trackId);
 
                 HydraulicBoundaryDatabase hydraulicBoundaryDatabase = canUsePreprocessor
-                                                                          ? new HydraulicBoundaryDatabase(true, Path.Combine(Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath)))
+                                                                          ? new HydraulicBoundaryDatabase(true, Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath))
                                                                           : new HydraulicBoundaryDatabase();
 
                 hydraulicBoundaryDatabase.FilePath = hydraulicBoundaryDatabaseFilePath;
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r3147d2f42ddbf18f08e0015f71aeeec2de60dd89
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 3147d2f42ddbf18f08e0015f71aeeec2de60dd89)
@@ -329,7 +329,7 @@
         }
 
         [Test]
-        public void Import_ImportingToValidTargetWithValidFileUsePreprocessorTrue_ImportHydraulicBoundaryLocationsToCollectionAndAssessmentSectionNotified()
+        public void Import_ImportingToValidTargetWithValidFileCanUsePreprocessorTrue_ImportHydraulicBoundaryLocationsToCollectionAndAssessmentSectionNotified()
         {
             // Setup
             var mocks = new MockRepository();
@@ -355,6 +355,7 @@
             });
             Assert.IsTrue(importResult);
             Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor);
+            Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor);
             Assert.AreEqual(directory, assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory);
             ICollection<HydraulicBoundaryLocation> importedLocations = assessmentSection.HydraulicBoundaryDatabase.Locations;
             Assert.AreEqual(106, importedLocations.Count);
@@ -364,7 +365,7 @@
         }
 
         [Test]
-        public void Import_ImportingToValidTargetWithValidFileUsePreprocessorFalse_ImportHydraulicBoundaryLocationsToCollectionAndAssessmentSectionNotified()
+        public void Import_ImportingToValidTargetWithValidFileCanUsePreprocessorFalse_ImportHydraulicBoundaryLocationsToCollectionAndAssessmentSectionNotified()
         {
             // Setup
             var mocks = new MockRepository();
@@ -389,7 +390,6 @@
             });
             Assert.IsTrue(importResult);
             Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor);
-            Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory);
             ICollection<HydraulicBoundaryLocation> importedLocations = assessmentSection.HydraulicBoundaryDatabase.Locations;
             Assert.AreEqual(9, importedLocations.Count);
             CollectionAssert.AllItemsAreNotNull(importedLocations);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReader.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r3147d2f42ddbf18f08e0015f71aeeec2de60dd89
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReader.cs	(.../HydraulicLocationConfigurationSqLiteDatabaseReader.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReader.cs	(.../HydraulicLocationConfigurationSqLiteDatabaseReader.cs)	(revision 3147d2f42ddbf18f08e0015f71aeeec2de60dd89)
@@ -56,8 +56,8 @@
         /// <summary>
         /// Gets the location ids from the database, based upon <paramref name="trackId"/>.
         /// </summary>
-        /// <param name="trackId">Hydraulic boundary track id.</param>
-        /// <returns>List of location id and Hrd location id found in the database.</returns>
+        /// <param name="trackId">The hydraulic boundary track id.</param>
+        /// <returns>A dictionary with pairs of Hrd location id (key) and location id (value) as found in the database.</returns>
         /// <exception cref="CriticalFileReadException">Thrown when the database query failed.</exception>
         /// <exception cref="LineParseException">Thrown when the database returned incorrect values for 
         /// required properties.</exception>
@@ -89,10 +89,10 @@
         /// <summary>
         /// Gets whether the preprocessor can be used for the given <paramref name="trackId"/>.
         /// </summary>
-        /// <param name="trackId">Hydraulic boundary track id.</param>
+        /// <param name="trackId">The hydraulic boundary track id.</param>
         /// <returns>The value found in the database; or <c>false</c> when the database
-        /// is valid but outdated (no usePreprocessor column present).</returns>
-        /// <exception cref="CriticalFileReadException">Thrown when the database query failed.</exception>
+        /// is valid but outdated (no UsePreprocessor column present).</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when the database query failed or when no results could be found.</exception>
         /// <exception cref="LineParseException">Thrown when the database returned incorrect values for 
         /// required properties.</exception>
         public bool GetCanUsePreprocessorByTrackId(long trackId)
@@ -123,8 +123,8 @@
         /// <summary>
         /// Gets the location ids from the database, based upon <paramref name="trackParameter"/>.
         /// </summary>
-        /// <param name="trackParameter">Hydraulic boundary track id.</param>
-        /// <returns>List of location id and Hrd location id found in the database.</returns>
+        /// <param name="trackParameter">A parameter containing the hydraulic boundary track id.</param>
+        /// <returns>A dictionary with pairs of Hrd location id (key) and location id (value) as found in the database.</returns>
         /// <exception cref="SQLiteException">Thrown when the database query failed.</exception>
         /// <exception cref="InvalidCastException">Thrown when the database returned incorrect values for 
         /// required properties.</exception>
@@ -156,9 +156,9 @@
         /// <summary>
         /// Gets whether the preprocessor can be used for the given <paramref name="trackParameter"/>.
         /// </summary>
-        /// <param name="trackParameter">Hydraulic boundary track id.</param>
+        /// <param name="trackParameter">A parameter containing the hydraulic boundary track id.</param>
         /// <returns>The value found in the database; or <c>false</c> when the database
-        /// is valid but outdated (no usePreprocessor column present).</returns>
+        /// is valid but outdated (no UsePreprocessor column present).</returns>
         /// <exception cref="SQLiteException">Thrown when the database query failed.</exception>
         /// <exception cref="FormatException">Thrown when the database returned incorrect values for 
         /// required properties.</exception>