Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicLocationConfigurationSettings.cs
===================================================================
diff -u -rfc505a6a1ef0418da1856b654a184044c5470782 -rcacdc06a5ebb830176ce5b8a9af661036849d381
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicLocationConfigurationSettings.cs	(.../HydraulicLocationConfigurationSettings.cs)	(revision fc505a6a1ef0418da1856b654a184044c5470782)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicLocationConfigurationSettings.cs	(.../HydraulicLocationConfigurationSettings.cs)	(revision cacdc06a5ebb830176ce5b8a9af661036849d381)
@@ -93,14 +93,16 @@
         /// <param name="windSpeed">The wind speed.</param>
         /// <param name="comment">The comment.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="scenarioName"/>
-        /// or <paramref name="scope"/> are <c>null</c>.</exception>
+        /// or <paramref name="scope"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="filePath"/>
+        /// is <c>null</c>, empty or consists of whitespace.</exception>
         public void SetValues(string filePath, string scenarioName, int year, string scope,
                               string seaLevel, string riverDischarge, string lakeLevel,
                               string windDirection, string windSpeed, string comment)
         {
-            if (filePath == null)
+            if (string.IsNullOrWhiteSpace(filePath))
             {
-                throw new ArgumentNullException(nameof(filePath));
+                throw new ArgumentException($@"'{nameof(filePath)}' is null, empty or consists of whitespace.");
             }
 
             if (scenarioName == null)
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs
===================================================================
diff -u -r80f89273f0c6f5540a79ad871c976b942845fac6 -rcacdc06a5ebb830176ce5b8a9af661036849d381
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs	(.../HydraulicLocationConfigurationSettingsTest.cs)	(revision 80f89273f0c6f5540a79ad871c976b942845fac6)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs	(.../HydraulicLocationConfigurationSettingsTest.cs)	(revision cacdc06a5ebb830176ce5b8a9af661036849d381)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 
@@ -48,7 +49,10 @@
         }
 
         [Test]
-        public void SetValues_FilePathNull_ThrowsArgumentNullException()
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("    ")]
+        public void SetValues_InvalidFilePathNull_ThrowsArgumentException(string invalidFilePath)
         {
             // Setup
             var random = new Random(21);
@@ -70,8 +74,8 @@
                                                          windDirection, windSpeed, comment);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("filePath", exception.ParamName);
+            const string expectedMessage = "'filePath' is null, empty or consists of whitespace.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
         }
 
         [Test]