Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r1259 -r1261
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(.../DamMacroStabilityInwardsKernelWrapper.cs)	(revision 1259)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(.../DamMacroStabilityInwardsKernelWrapper.cs)	(revision 1261)
@@ -369,6 +369,7 @@
         /// </summary>
         /// <param name="damKernelInput">The dam kernel input.</param>
         /// <param name="kernelDataOutput">The kernel data output.</param>
+        /// <param name="designScenario">The design scenario.</param>
         /// <param name="resultMessage">The result message.</param>
         /// <param name="designResults">The design results.</param>
         /// <exception cref="NoNullAllowedException"></exception>
@@ -395,7 +396,7 @@
 
             // If designScenario indicates an unsuccesfull design then reset the designResult to an unsuccesfull calculation 
             // The results that were put above, were from the previous run
-            if (designScenario.CalculationResult == CalculationResult.RunFailed)
+            if ((designScenario != null) && (designScenario.CalculationResult == CalculationResult.RunFailed))
             {
                 var designResult = designResults[designResults.Count - 1];
                 designResult.CalculationResult = CalculationResult.RunFailed;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs
===================================================================
diff -u -r1174 -r1261
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs	(.../DesignCalculatorSingle.cs)	(revision 1174)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs	(.../DesignCalculatorSingle.cs)	(revision 1261)
@@ -27,6 +27,7 @@
 using Deltares.DamEngine.Calculators.Properties;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
 
 namespace Deltares.DamEngine.Calculators.DikesDesign
@@ -54,6 +55,7 @@
             var designResults = new List<DesignResult>();
             List<LogMessage> locationCalculationMessages = new List<LogMessage>();
             List<LogMessage> validationMessages;
+            designScenario.CalculationResult = CalculationResult.NoRun;
             try
             {
                 int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out validationMessages);
@@ -80,11 +82,13 @@
                 }
                 string resultMessage = sb.ToString();
 
+                designScenario.CalculationResult = CalculationResult.Succeeded;
                 kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults);
             }
             catch (Exception exception)
             {
                 string resultMessage = exception.Message;
+                designScenario.CalculationResult = CalculationResult.RunFailed;
                 kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults);
             }
             finally