Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
===================================================================
diff -u -r6408 -r6670
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 6408)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 6670)
@@ -93,6 +93,6 @@
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
-        Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(10), "Number of messages found = " + output.Results.CalculationMessages.Length);
+        Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(0), "Number of messages found = " + output.Results.CalculationMessages.Length);
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r6668 -r6670
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 6668)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 6670)
@@ -363,7 +363,7 @@
             calculationResult = CalculationResult.Succeeded;
             DesignScenario designScenario = damKernelInput.Location.CurrentScenario;
             kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults);
-            if (designResults.Count > 0 && designResults[0].CalculationResult == CalculationResult.Succeeded)
+            if (designResults.Count > 0 && designResults[0].CalculationResult != CalculationResult.NoRun)
             {
                 timeSerieEntry.Value = designResults[0].SafetyFactor.Value;
                 if (damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismSystemType is
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r6533 -r6670
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6533)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6670)
@@ -268,6 +268,8 @@
         designResult.StabilityDesignResults.StabilityModelType = macroStabilityOutputItem.StabilityModelType;
         if (macroStabilityOutputItem.CalculationResult == CalculationResult.Succeeded)
         {
+            designResult.CalculationResult = macroStabilityOutputItem.CalculationResult;
+
             designResult.StabilityDesignResults.SafetyFactor = macroStabilityOutputItem.SafetyFactor;
             designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex;
 
@@ -285,11 +287,6 @@
                     macroStabilityOutputItem.PassiveCenterPointRadius;
             }
         }
-
-        if (designResult.CalculationResult == CalculationResult.Succeeded)
-        {
-            designResult.CalculationResult = macroStabilityOutputItem.CalculationResult;
-        }
     }
 
     /// <summary>