Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs
===================================================================
diff -u -r6657 -r7007
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs	(.../ShearStrengthModelsTests.cs)	(revision 6657)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs	(.../ShearStrengthModelsTests.cs)	(revision 7007)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.IO;
+using System.Text;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io.XmlOutput;
@@ -132,15 +133,16 @@
                 Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("ShansepMaterial"));
                 Assert.That(output.Results.CalculationResults[1].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded)));
             });
-            Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(3));
+            Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1));
             Assert.Multiple(() =>
             {
                 Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'"));
-                Assert.That(output.Results.CalculationMessages[1].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[1].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
-                Assert.That(output.Results.CalculationMessages[2].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[2].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
+                Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo(
+                    new StringBuilder()
+                        .Append("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'.")
+                        .AppendLine("The first sigma value must be 0 for sigma/tau table ")
+                        .AppendLine("The first sigma value must be 0 for sigma/tau table ")
+                        .ToString()));
             });
         }
 
@@ -175,17 +177,18 @@
                 Assert.That(output.Results.CalculationResults[3].ProfileName, Is.EqualTo("SigmaTauPhi45"));
                 Assert.That(output.Results.CalculationResults[4].ProfileName, Is.EqualTo("ShansepPhi45"));
                 Assert.That(output.Results.CalculationResults[5].ProfileName, Is.EqualTo("SuTablePhi45"));
-                Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(3));
+                Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1));
             });
 
             Assert.Multiple(() =>
             {
                 Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("Validation failed for location 'Comparison models (constant tau)', subsoil scenario 'SuTableCsttSu', design scenario '1'"));
-                Assert.That(output.Results.CalculationMessages[1].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[1].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
-                Assert.That(output.Results.CalculationMessages[2].MessageType, Is.EqualTo(MessageMessageType.Error));
-                Assert.That(output.Results.CalculationMessages[2].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
+                Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo(
+                    new StringBuilder()
+                        .Append("Validation failed for location 'Comparison models (constant tau)', subsoil scenario 'SuTableCsttSu', design scenario '1'.")
+                        .AppendLine("Su table first point must have an effective stress of 0")
+                        .AppendLine("Su table first point must have an effective stress of 0")
+                        .ToString()));
             });
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityKernelOutput.cs
===================================================================
diff -u -r7006 -r7007
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityKernelOutput.cs	(.../FillEngineFromMacroStabilityKernelOutput.cs)	(revision 7006)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityKernelOutput.cs	(.../FillEngineFromMacroStabilityKernelOutput.cs)	(revision 7007)
@@ -50,16 +50,19 @@
 
     private static void TransferMessages(MessagesTypeMessage[] kernelMessages, List<LogMessage> logMessages)
     {
-        foreach (var message in kernelMessages)
+        if (kernelMessages != null)
         {
-            LogMessageType messageType;
-            switch (message.MessageType)
+            foreach (var message in kernelMessages)
             {
-                case MessageType.Warning: messageType = LogMessageType.Warning; break;
-                case MessageType.Error: messageType = LogMessageType.Error; break; 
-                default: messageType = LogMessageType.Info; break;
+                LogMessageType messageType;
+                switch (message.MessageType)
+                {
+                    case MessageType.Warning: messageType = LogMessageType.Warning; break;
+                    case MessageType.Error: messageType = LogMessageType.Error; break; 
+                    default: messageType = LogMessageType.Info; break;
+                }
+                logMessages.Add(new LogMessage(messageType, null, message.Message));
             }
-            logMessages.Add(new LogMessage(messageType, null, message.Message));
         }
     }