Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r95e5c7c46e45f5c240cd0c9928484f0f4714e147 -rd79f0f4aa80c99ba45a7ff3a502b5437975f7b58
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 95e5c7c46e45f5c240cd0c9928484f0f4714e147)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision d79f0f4aa80c99ba45a7ff3a502b5437975f7b58)
@@ -101,8 +101,9 @@
         /// <param name="messageProvider">The object which is used to build log messages.</param>
         /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
         /// equals <see cref="string.Empty"/>.</remarks>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/> or
-        /// <paramref name="hydraulicBoundaryLocationCalculation"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/>,
+        /// <paramref name="hydraulicBoundaryLocationCalculation"/> or <paramref name="messageProvider"/>
+        /// is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when 
         /// <list type="bullet">
         /// <item><paramref name="hydraulicBoundaryDatabaseFilePath"/> contains invalid characters.</item>
@@ -133,6 +134,11 @@
                 throw new ArgumentNullException(nameof(hydraulicBoundaryLocationCalculation));
             }
 
+            if (messageProvider == null)
+            {
+                throw new ArgumentNullException(nameof(messageProvider));
+            }
+
             string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
 
             CalculationServiceHelper.LogCalculationBegin();
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r7dce1ceb498815baa3486f459710c77327d4ef10 -rd79f0f4aa80c99ba45a7ff3a502b5437975f7b58
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 7dce1ceb498815baa3486f459710c77327d4ef10)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision d79f0f4aa80c99ba45a7ff3a502b5437975f7b58)
@@ -101,8 +101,9 @@
         /// <param name="norm">The norm of the assessment section.</param>
         /// <param name="messageProvider">The object which is used to build log messages.</param>
         /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/> equals <see cref="string.Empty"/>.</remarks>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/> or
-        /// <paramref name="hydraulicBoundaryLocationCalculation"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/>,
+        /// <paramref name="hydraulicBoundaryLocationCalculation"/> or <paramref name="messageProvider"/>
+        /// is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when 
         /// <list type="bullet">
         /// <item><paramref name="hydraulicBoundaryDatabaseFilePath"/> contains invalid characters.</item>
@@ -133,6 +134,11 @@
                 throw new ArgumentNullException(nameof(hydraulicBoundaryLocationCalculation));
             }
 
+            if (messageProvider == null)
+            {
+                throw new ArgumentNullException(nameof(messageProvider));
+            }
+
             string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
 
             CalculationServiceHelper.LogCalculationBegin();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -r95e5c7c46e45f5c240cd0c9928484f0f4714e147 -rd79f0f4aa80c99ba45a7ff3a502b5437975f7b58
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 95e5c7c46e45f5c240cd0c9928484f0f4714e147)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision d79f0f4aa80c99ba45a7ff3a502b5437975f7b58)
@@ -177,6 +177,22 @@
         }
 
         [Test]
+        public void Calculate_MessageProviderNull_ThrowArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new DesignWaterLevelCalculationService().Calculate(new TestHydraulicBoundaryLocation(),
+                                                                                         new HydraulicBoundaryLocationCalculation(),
+                                                                                         string.Empty,
+                                                                                         string.Empty,
+                                                                                         1,
+                                                                                         null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("messageProvider", exception.ParamName);
+        }
+
+        [Test]
         [TestCase(true)]
         [TestCase(false)]
         public void Calculate_ValidDesignWaterLevelCalculationAndConverges_StartsCalculationWithRightParametersAndLogs(bool readIllustrationPoints)
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r7dce1ceb498815baa3486f459710c77327d4ef10 -rd79f0f4aa80c99ba45a7ff3a502b5437975f7b58
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 7dce1ceb498815baa3486f459710c77327d4ef10)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision d79f0f4aa80c99ba45a7ff3a502b5437975f7b58)
@@ -164,7 +164,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            TestDelegate test = () => new WaveHeightCalculationService().Calculate(new TestHydraulicBoundaryLocation(), 
+            TestDelegate test = () => new WaveHeightCalculationService().Calculate(new TestHydraulicBoundaryLocation(),
                                                                                    null,
                                                                                    testDataPath,
                                                                                    validPreprocessorDirectory,
@@ -177,6 +177,22 @@
         }
 
         [Test]
+        public void Calculate_MessageProviderNull_ThrowArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new WaveHeightCalculationService().Calculate(new TestHydraulicBoundaryLocation(),
+                                                                                   new HydraulicBoundaryLocationCalculation(),
+                                                                                   string.Empty,
+                                                                                   string.Empty,
+                                                                                   1,
+                                                                                   null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("messageProvider", exception.ParamName);
+        }
+
+        [Test]
         [TestCase(true)]
         [TestCase(false)]
         public void Calculate_ValidWaveHeightCalculationAndConverges_StartsCalculationWithRightParametersAndLogs(bool readIllustrationPoints)