Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/ReadDuneLocation.cs
===================================================================
diff -u -r0c22987b330d73d1258fe7b86cb7d181b2043352 -r1c810d4bd44bbc76e6f5b84f8931f6f05cb51a3c
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/ReadDuneLocation.cs	(.../ReadDuneLocation.cs)	(revision 0c22987b330d73d1258fe7b86cb7d181b2043352)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/ReadDuneLocation.cs	(.../ReadDuneLocation.cs)	(revision 1c810d4bd44bbc76e6f5b84f8931f6f05cb51a3c)
@@ -36,16 +36,11 @@
         /// <param name="location">The coordinate of the <see cref="ReadDuneLocation"/>.</param>
         /// <param name="coastalAreaId">Coastal area id of the <see cref="ReadDuneLocation"/>.</param>
         /// <param name="offset">Offset of the <see cref="ReadDuneLocation"/>.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/> or <paramref name="location"/> is <c>null</c>.</exception>
         public ReadDuneLocation(string name, Point2D location, int coastalAreaId, int offset)
         {
-            if (name == null)
-            {
-                throw new ArgumentNullException(nameof(name));
-            }
-
-            Name = name;
-            Location = location;
+            Name = name ?? throw new ArgumentNullException(nameof(name));
+            Location = location ?? throw new ArgumentNullException(nameof(location));
             CoastalAreaId = coastalAreaId;
             Offset = offset;
         }
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/ReadDuneLocationTest.cs
===================================================================
diff -u -r0c22987b330d73d1258fe7b86cb7d181b2043352 -r1c810d4bd44bbc76e6f5b84f8931f6f05cb51a3c
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/ReadDuneLocationTest.cs	(.../ReadDuneLocationTest.cs)	(revision 0c22987b330d73d1258fe7b86cb7d181b2043352)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/ReadDuneLocationTest.cs	(.../ReadDuneLocationTest.cs)	(revision 1c810d4bd44bbc76e6f5b84f8931f6f05cb51a3c)
@@ -40,6 +40,17 @@
         }
 
         [Test]
+        public void Constructor_LocationNull_ThrowArgumentNullException()
+        {
+            // Call
+            void Call() => new ReadDuneLocation(string.Empty, null, 0, 0);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("location", exception.ParamName);
+        }
+
+        [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup