Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -ra97c4ffe5254af061462539883d25722be13e539 -r1042a38d3663daeda5a8e1083edbc63a4b6aae94
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 1042a38d3663daeda5a8e1083edbc63a4b6aae94)
@@ -55,17 +55,18 @@
         public WaveHeightCalculationActivity(ICalculationMessageProvider messageProvider,
                                              IHydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath, string ringId, double norm)
         {
-            if (messageProvider == null)
+            if (hydraulicBoundaryLocation == null)
             {
-                throw new ArgumentNullException("messageProvider");
+                throw new ArgumentNullException("hydraulicBoundaryLocation");
             }
-            this.messageProvider = messageProvider;
 
-            if (hydraulicBoundaryLocation == null)
+            if (messageProvider == null)
             {
-                throw new ArgumentNullException("hydraulicBoundaryLocation");
+                throw new ArgumentNullException("messageProvider");
             }
+
             this.hydraulicBoundaryLocation = hydraulicBoundaryLocation;
+            this.messageProvider = messageProvider;
 
             this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath;
             this.ringId = ringId;
@@ -85,7 +86,7 @@
             PerformRun(() => WaveHeightCalculationService.Instance.Validate(
                 messageProvider.GetCalculationName(hydraulicBoundaryLocation.Name),
                 hydraulicBoundaryDatabaseFilePath),
-                       () => hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) double.NaN,
+                       () => RingtoetsCommonDataSynchronizationService.ClearWaveHeight(hydraulicBoundaryLocation),
                        () => WaveHeightCalculationService.Instance.Calculate(hydraulicBoundaryLocation,
                                                                              hydraulicBoundaryDatabaseFilePath,
                                                                              ringId, norm, messageProvider));