Index: Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r025572749b152ab165c15dc432113acc16d604b3
--- Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs	(.../HydraulicBoundaryDataHelper.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs	(.../HydraulicBoundaryDataHelper.cs)	(revision 025572749b152ab165c15dc432113acc16d604b3)
@@ -22,6 +22,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using Core.Common.Base.IO;
 using Core.Common.Util;
 using Core.Common.Util.Builders;
@@ -109,22 +110,48 @@
 
         /// <summary>
         /// Checks whether the provided version string matches the version string in the provided hydraulic boundary database file.
+        /// </summary>
         /// <param name="version">The version to check for.</param>
         /// <param name="hrdFilePath">The path of the hydraulic boundary database to check.</param>
         /// <returns><c>true</c> if the provided version string matches the version string in the provided hydraulic boundary
         /// database file, <c>false</c> otherwise.</returns>
         /// <exception cref="CriticalFileReadException">Thrown when no connection could be created with the hydraulic boundary
         /// database.</exception>
-        /// </summary>
         public static bool IsCorrectVersion(string version, string hrdFilePath)
         {
-            using (var db = new HydraulicBoundaryDatabaseReader(hrdFilePath))
+            using (var hydraulicBoundaryDatabaseReader = new HydraulicBoundaryDatabaseReader(hrdFilePath))
             {
-                return version == db.ReadVersion();
+                return version == hydraulicBoundaryDatabaseReader.ReadVersion();
             }
         }
 
         /// <summary>
+        /// Checks whether the provided hydraulic boundary database matches the file name that is referred to from the provided
+        /// hydraulic location configuration database.
+        /// </summary>
+        /// <param name="hlcdFilePath">The path of the hydraulic location configuration database to check.</param>
+        /// <param name="hrdFilePath">The path of the hydraulic boundary database to check.</param>
+        /// <returns><c>true</c> if the hydraulic boundary database matches the file name that is referred to from the hydraulic
+        /// location configuration database, <c>false</c> otherwise.</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when no connection could be created with the hydraulic location
+        /// configuration database or the hydraulic boundary database.</exception>
+        public static bool IsCorrectHrdFile(string hlcdFilePath, string hrdFilePath)
+        {
+            using (var hydraulicLocationConfigurationDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(hlcdFilePath))
+            {
+                ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicLocationConfigurationDatabaseReader.Read();
+
+                using (var hydraulicBoundaryDatabaseReader = new HydraulicBoundaryDatabaseReader(hrdFilePath))
+                {
+                    ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = hydraulicBoundaryDatabaseReader.Read();
+
+                    return readHydraulicLocationConfigurationDatabase.ReadTracks.Any(rt => rt.TrackId == readHydraulicBoundaryDatabase.TrackId
+                                                                                           && rt.HrdFileName == Path.GetFileName(hrdFilePath));
+                }
+            }
+        }
+
+        /// <summary>
         /// Gets the file path of the hydraulic boundary settings database.
         /// </summary>
         /// <param name="hrdFilePath">The file path of the corresponding hydraulic boundary database.</param>
Index: Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r025572749b152ab165c15dc432113acc16d604b3
--- Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs	(.../HydraulicBoundaryDataConnectionValidator.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs	(.../HydraulicBoundaryDataConnectionValidator.cs)	(revision 025572749b152ab165c15dc432113acc16d604b3)
@@ -70,6 +70,11 @@
                 return string.Format(Resources.Hydraulic_boundary_database_mismatching_version_in_file_0_, hydraulicBoundaryDatabase.FilePath);
             }
 
+            if (!HydraulicBoundaryDataHelper.IsCorrectHrdFile(hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath, hydraulicBoundaryDatabase.FilePath))
+            {
+                return string.Format(Resources.Hydraulic_location_configuration_database_refers_to_hydraulic_boundary_database_that_does_not_correspond_with_0, hydraulicBoundaryDatabase.FilePath);
+            }
+
             return null;
         }
     }
Index: Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r025572749b152ab165c15dc432113acc16d604b3
--- Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 025572749b152ab165c15dc432113acc16d604b3)
@@ -215,6 +215,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Het HLCD bestand verwijst naar een HRD bestand dat niet correspondeert met &apos;{0}&apos;..
+        /// </summary>
+        public static string Hydraulic_location_configuration_database_refers_to_hydraulic_boundary_database_that_does_not_correspond_with_0 {
+            get {
+                return ResourceManager.GetString("Hydraulic_location_configuration_database_refers_to_hydraulic_boundary_database_t" +
+                        "hat_does_not_correspond_with_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De waarde voor &apos;{0}&apos; moet een concreet getal zijn..
         /// </summary>
         public static string NumericInputRule_Value_of_0_must_be_a_valid_number {
Index: Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.resx
===================================================================
diff -u -re72f1aeba979e2399a54d18cd348e42ba6558899 -r025572749b152ab165c15dc432113acc16d604b3
--- Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision e72f1aeba979e2399a54d18cd348e42ba6558899)
+++ Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 025572749b152ab165c15dc432113acc16d604b3)
@@ -212,4 +212,7 @@
   <data name="CalculationService_ValidateInput_Cannot_determine_AssessmentLevel" xml:space="preserve">
     <value>Kan de waterstand niet afleiden op basis van de invoer.</value>
   </data>
+  <data name="Hydraulic_location_configuration_database_refers_to_hydraulic_boundary_database_that_does_not_correspond_with_0" xml:space="preserve">
+    <value>Het HLCD bestand verwijst naar een HRD bestand dat niet correspondeert met '{0}'.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r025572749b152ab165c15dc432113acc16d604b3
--- Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs	(.../TargetProbabilityCalculationService.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs	(.../TargetProbabilityCalculationService.cs)	(revision 025572749b152ab165c15dc432113acc16d604b3)
@@ -76,6 +76,17 @@
                 isValid = false;
             }
 
+            if (isValid && !HydraulicBoundaryDataHelper.IsCorrectHrdFile(calculationSettings.HlcdFilePath, calculationSettings.HrdFilePath))
+            {
+                CalculationServiceHelper.LogMessagesAsError(Resources.Hydraulic_location_configuration_database_refers_to_hydraulic_boundary_database_that_does_not_correspond_with_0,
+                                                            new[]
+                                                            {
+                                                                calculationSettings.HrdFilePath
+                                                            });
+
+                isValid = false;
+            }
+
             CalculationServiceHelper.LogValidationEnd();
 
             return isValid;