Index: Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r7a68fbcefe7f73fa6f0a05b536dd2abc166a8105
--- Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs	(.../HydraulicBoundaryDataConnectionValidator.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs	(.../HydraulicBoundaryDataConnectionValidator.cs)	(revision 7a68fbcefe7f73fa6f0a05b536dd2abc166a8105)
@@ -32,18 +32,25 @@
     public static class HydraulicBoundaryDataConnectionValidator
     {
         /// <summary>
-        /// Validates the connection of the provided hydraulic boundary data.
+        /// Validates the connection of the provided <paramref name="hydraulicBoundaryData"/> in relation to the provided
+        /// <paramref name="hydraulicBoundaryLocation"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryData">The hydraulic boundary data to validate.</param>
+        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to validate for.</param>
         /// <returns>An error message if a problem was found; <c>null</c> in case no problems were found.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryData"/> is <c>null</c>.</exception>
-        public static string Validate(HydraulicBoundaryData hydraulicBoundaryData)
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public static string Validate(HydraulicBoundaryData hydraulicBoundaryData, HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             if (hydraulicBoundaryData == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryData));
             }
 
+            if (hydraulicBoundaryLocation == null)
+            {
+                throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
+            }
+
             if (!hydraulicBoundaryData.IsLinked())
             {
                 return Resources.HydraulicBoundaryDataConnectionValidator_No_hydraulic_boundary_database_imported;