Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDataExtensions.cs
===================================================================
diff -u -r50761a144de4fb387fb7d851b47b38d536c94404 -r74d7d9e7fa07257d3ea71aff10555ee955d6bb4c
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDataExtensions.cs	(.../HydraulicBoundaryDataExtensions.cs)	(revision 50761a144de4fb387fb7d851b47b38d536c94404)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDataExtensions.cs	(.../HydraulicBoundaryDataExtensions.cs)	(revision 74d7d9e7fa07257d3ea71aff10555ee955d6bb4c)
@@ -52,14 +52,19 @@
         /// </summary>
         /// <param name="hydraulicBoundaryData">The hydraulic boundary data to set the new folder path for.</param>
         /// <param name="newFolderPath">The new folder path to set.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryData"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public static void SetNewFolderPath(this HydraulicBoundaryData hydraulicBoundaryData, string newFolderPath)
         {
             if (hydraulicBoundaryData == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryData));
             }
 
+            if (newFolderPath == null)
+            {
+                throw new ArgumentNullException(nameof(newFolderPath));
+            }
+
             hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath
                 = GetNewFilePath(hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath, newFolderPath);
             hydraulicBoundaryData.HydraulicBoundaryDatabases
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDataExtensionsTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r74d7d9e7fa07257d3ea71aff10555ee955d6bb4c
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDataExtensionsTest.cs	(.../HydraulicBoundaryDataExtensionsTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDataExtensionsTest.cs	(.../HydraulicBoundaryDataExtensionsTest.cs)	(revision 74d7d9e7fa07257d3ea71aff10555ee955d6bb4c)
@@ -70,5 +70,30 @@
             // Assert
             Assert.IsTrue(isLinked);
         }
+
+        [Test]
+        public void SetNewFolderPath_HydraulicBoundaryDataNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => HydraulicBoundaryDataExtensions.SetNewFolderPath(null, string.Empty);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
+            Assert.AreEqual("hydraulicBoundaryData", paramName);
+        }
+
+        [Test]
+        public void SetNewFolderPath_NewFolderPathNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var hydraulicBoundaryData = new HydraulicBoundaryData();
+
+            // Call
+            void Call() => hydraulicBoundaryData.SetNewFolderPath(null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
+            Assert.AreEqual("newFolderPath", paramName);
+        }
     }
 }
\ No newline at end of file