Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs
===================================================================
diff -u -r1965 -r2136
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs	(.../DesignCalculatorSingle.cs)	(revision 1965)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs	(.../DesignCalculatorSingle.cs)	(revision 2136)
@@ -90,6 +90,7 @@
                 string resultMessage = exception.Message;
                 designScenario.CalculationResult = CalculationResult.RunFailed;
                 kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults);
+                throw new DesignCalculatorException(Resources.DesignUnsuccessful + " " + resultMessage);
             }
             finally
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r2114 -r2136
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2114)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2136)
@@ -232,12 +232,11 @@
             // Expected an english message, but this can not be fixed with version 16.2 of the kernel, see MWDAM-1395
             Assert.AreEqual("De effectieve spanning mag niet negatief zijn.\r\n", output.Results.CalculationResults[1].PipingDesignResults.ResultMessage);
             Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult));
-            //ToDo MWDAM-1396 expected location etc included in message, but is only last part of message
-            //Assert.AreEqual("Location '100', subsoil scenario 'segment1_1D2', design scenario '1': " +
-            //"The calculation failed with error message " +
-            //"'The design was not successful. " +
-            //"De effectieve spanning mag niet negatief zijn.'",
-            //output.Results.CalculationMessages[0].Message1);
+            Assert.AreEqual("Location '100', subsoil scenario 'segment1_1D2', design scenario '1': " +
+            "The calculation failed with error message " +
+            "'The design was not successful. " +
+            "De effectieve spanning mag niet negatief zijn.\r\n'",
+            output.Results.CalculationMessages[0].Message1);
         }
 
     }