Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs
===================================================================
diff -u -r21793a296d0cd97d04a07d8287878a7b9ae16145 -r962b12b30e8f86327095e2929dd92fe2aeddbc48
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs	(.../ClosingStructuresCalculationStochastAssigner.cs)	(revision 21793a296d0cd97d04a07d8287878a7b9ae16145)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs	(.../ClosingStructuresCalculationStochastAssigner.cs)	(revision 962b12b30e8f86327095e2929dd92fe2aeddbc48)
@@ -131,6 +131,15 @@
 
         protected override bool ValidateSpecificStochasts()
         {
+            if (Configuration.ModelFactorSuperCriticalFlow?.StandardDeviation != null
+                || Configuration.ModelFactorSuperCriticalFlow?.VariationCoefficient != null)
+            {
+                Log.LogCalculationConversionError(
+                    RingtoetsCommonIOResources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_ModelFactorSuperCriticalFlow,
+                    Configuration.Name);
+                return false;
+            }
+
             if (Configuration.DrainCoefficient?.StandardDeviation != null
                 || Configuration.DrainCoefficient?.VariationCoefficient != null)
             {
@@ -139,6 +148,7 @@
                     Configuration.Name);
                 return false;
             }
+
             return true;
         }
     }
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/ConfigurationValidationExtensions.cs
===================================================================
diff -u -r7e9c5360c08230addd99e35e03706d401e6e1e12 -r962b12b30e8f86327095e2929dd92fe2aeddbc48
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/ConfigurationValidationExtensions.cs	(.../ConfigurationValidationExtensions.cs)	(revision 7e9c5360c08230addd99e35e03706d401e6e1e12)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/ConfigurationValidationExtensions.cs	(.../ConfigurationValidationExtensions.cs)	(revision 962b12b30e8f86327095e2929dd92fe2aeddbc48)
@@ -48,6 +48,7 @@
             {
                 throw new ArgumentNullException(nameof(calculationName));
             }
+
             if (log == null)
             {
                 throw new ArgumentNullException(nameof(log));
@@ -72,6 +73,7 @@
 
                 return false;
             }
+
             return true;
         }
 
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs
===================================================================
diff -u -ra8744fa1e115c1317d15a3f5784474aacaf2227d -r962b12b30e8f86327095e2929dd92fe2aeddbc48
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs	(.../StructuresCalculationStochastAssigner.cs)	(revision a8744fa1e115c1317d15a3f5784474aacaf2227d)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs	(.../StructuresCalculationStochastAssigner.cs)	(revision 962b12b30e8f86327095e2929dd92fe2aeddbc48)
@@ -175,14 +175,6 @@
                 return false;
             }
 
-            if (Configuration.ModelFactorSuperCriticalFlow?.StandardDeviation != null
-                || Configuration.ModelFactorSuperCriticalFlow?.VariationCoefficient != null)
-            {
-                Log.LogCalculationConversionError(Resources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_ModelFactorSuperCriticalFlow,
-                                                  Configuration.Name);
-                return false;
-            }
-
             return true;
         }
 
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationStochastAssigner.cs
===================================================================
diff -u -ra2405640a09a0b6df9457c317ab921a8dd7877fa -r962b12b30e8f86327095e2929dd92fe2aeddbc48
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationStochastAssigner.cs	(.../HeightStructuresCalculationStochastAssigner.cs)	(revision a2405640a09a0b6df9457c317ab921a8dd7877fa)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationStochastAssigner.cs	(.../HeightStructuresCalculationStochastAssigner.cs)	(revision 962b12b30e8f86327095e2929dd92fe2aeddbc48)
@@ -23,7 +23,9 @@
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.IO.Configurations;
+using Ringtoets.Common.IO.Configurations.Helpers;
 using Ringtoets.HeightStructures.Data;
+using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.IO.Configurations
 {
@@ -102,5 +104,19 @@
                     (i, d) => i.StormDuration = (VariationCoefficientLogNormalDistribution) d);
             }
         }
+
+        protected override bool ValidateSpecificStochasts()
+        {
+            if (Configuration.ModelFactorSuperCriticalFlow?.StandardDeviation != null
+                || Configuration.ModelFactorSuperCriticalFlow?.VariationCoefficient != null)
+            {
+                Log.LogCalculationConversionError(
+                    RingtoetsCommonIOResources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_ModelFactorSuperCriticalFlow,
+                    Configuration.Name);
+                return false;
+            }
+
+            return true;
+        }
     }
 }
\ No newline at end of file