Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -rbdd2aebb6277f45903f5b90d4045ceaa1d477032
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs	(.../HydraulicBoundaryCalculationSettingsFactory.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs	(.../HydraulicBoundaryCalculationSettingsFactory.cs)	(revision bdd2aebb6277f45903f5b90d4045ceaa1d477032)
@@ -30,20 +30,29 @@
     {
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicBoundaryCalculationSettings"/> based on the provided
-        /// <paramref name="hydraulicBoundaryData"/>.
+        /// <paramref name="hydraulicBoundaryData"/> and <paramref name="hydraulicBoundaryLocation"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryData">The <see cref="HydraulicBoundaryData"/> to create the
         /// <see cref="HydraulicBoundaryCalculationSettings"/> for.</param>
+        /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> to create the
+        /// <see cref="HydraulicBoundaryCalculationSettings"/> for.</param>
         /// <returns>A <see cref="HydraulicBoundaryCalculationSettings"/> instance.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when either the hydraulic boundary database file path or the hydraulic
         /// location configuration database file path is <c>null</c>, is empty or consists of whitespaces.</exception>
-        public static HydraulicBoundaryCalculationSettings CreateSettings(HydraulicBoundaryData hydraulicBoundaryData)
+        public static HydraulicBoundaryCalculationSettings CreateSettings(HydraulicBoundaryData hydraulicBoundaryData,
+                                                                          HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             if (hydraulicBoundaryData == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryData));
             }
 
+            if (hydraulicBoundaryLocation == null)
+            {
+                throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
+            }
+
             return new HydraulicBoundaryCalculationSettings(hydraulicBoundaryData.FilePath,
                                                             hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath,
                                                             hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.UsePreprocessorClosure);
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -rbdd2aebb6277f45903f5b90d4045ceaa1d477032
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs	(.../HydraulicBoundaryCalculationSettingsFactoryTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs	(.../HydraulicBoundaryCalculationSettingsFactoryTest.cs)	(revision bdd2aebb6277f45903f5b90d4045ceaa1d477032)
@@ -23,6 +23,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Common.Data.TestUtil;
 
 namespace Riskeer.Common.Data.Test.Hydraulics
 {
@@ -33,14 +34,25 @@
         public void CreateSettings_HydraulicBoundaryDataNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => HydraulicBoundaryCalculationSettingsFactory.CreateSettings(null);
+            void Call() => HydraulicBoundaryCalculationSettingsFactory.CreateSettings(null, new TestHydraulicBoundaryLocation());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("hydraulicBoundaryData", exception.ParamName);
         }
 
         [Test]
+        public void CreateSettings_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => HydraulicBoundaryCalculationSettingsFactory.CreateSettings(new HydraulicBoundaryData(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("hydraulicBoundaryLocation", exception.ParamName);
+        }
+
+        [Test]
         public void CreateSettings_WithLinkedHydraulicBoundaryData_ReturnsExpectedSettings()
         {
             // Setup