Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r1472 -r1473
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 1472)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 1473)
@@ -95,13 +95,21 @@
             foreach (DesignResult oneCoreResult in outputOneCore.Results.CalculationResults.DesignResults)
             {
                 DesignResult multiCoreResult = outputMultiCore.Results.CalculationResults.DesignResults.Where(x => x.LocationName.Equals(oneCoreResult.LocationName) && x.ProfileName.Equals(oneCoreResult.ProfileName)).FirstOrDefault();
-                Assert.NotNull(multiCoreResult);
-                if (Math.Abs(oneCoreResult.StabilityDesignResults.SafetyFactor - multiCoreResult.StabilityDesignResults.SafetyFactor) > tolerance)
+                if (multiCoreResult == null)
                 {
-                    var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
+                    var diffString = String.Format("No mutlicore result in {0}, {1}", oneCoreResult.LocationName, oneCoreResult.ProfileName);
                     differencesStringBuilder.AppendLine(diffString);
                     differences.Add(diffString);
                 }
+                else
+                {
+                    if (Math.Abs(oneCoreResult.StabilityDesignResults.SafetyFactor - multiCoreResult.StabilityDesignResults.SafetyFactor) > tolerance)
+                    {
+                        var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
+                        differencesStringBuilder.AppendLine(diffString);
+                        differences.Add(diffString);
+                    }
+                }
             }
 
             Assert.IsTrue(differences.Count == 0, "Differences found" + Environment.NewLine + differencesStringBuilder);
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCorePipingCalculationTests.cs
===================================================================
diff -u -r1472 -r1473
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCorePipingCalculationTests.cs	(.../MultiCorePipingCalculationTests.cs)	(revision 1472)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCorePipingCalculationTests.cs	(.../MultiCorePipingCalculationTests.cs)	(revision 1473)
@@ -79,34 +79,42 @@
             foreach (DesignResult oneCoreResult in outputOneCore.Results.CalculationResults.DesignResults)
             {
                 DesignResult multiCoreResult = outputMultiCore.Results.CalculationResults.DesignResults.Where(x => x.LocationName.Equals(oneCoreResult.LocationName) && x.ProfileName.Equals(oneCoreResult.ProfileName)).FirstOrDefault();
-                Assert.NotNull(multiCoreResult);
-                switch (pipingModelType)
+                if (multiCoreResult == null)
                 {
-                    case PipingModelType.Bligh:
-                        if (Math.Abs(oneCoreResult.PipingDesignResults.BlighFactor - multiCoreResult.PipingDesignResults.BlighFactor) > tolerance)
-                        {
-                            var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
-                            differencesStringBuilder.AppendLine(diffString);
-                            differences.Add(diffString);
-                        }
-                        break;
-                    case PipingModelType.Sellmeijer4Forces:
-                        if (Math.Abs(oneCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor - multiCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor) > tolerance)
-                        {
-                            var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
-                            differencesStringBuilder.AppendLine(diffString);
-                            differences.Add(diffString);
-                        }
-                        break;
-                    case PipingModelType.SellmeijerVnk:
-                        if (Math.Abs(oneCoreResult.PipingDesignResults.SellmeijerVnkFactor - multiCoreResult.PipingDesignResults.SellmeijerVnkFactor) > tolerance)
-                        {
-                            var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
-                            differencesStringBuilder.AppendLine(diffString);
-                            differences.Add(diffString);
-                        }
-                        break;
+                    var diffString = String.Format("No mutlicore result in {0}, {1}", oneCoreResult.LocationName, oneCoreResult.ProfileName);
+                    differencesStringBuilder.AppendLine(diffString);
+                    differences.Add(diffString);
                 }
+                else
+                {
+                    switch (pipingModelType)
+                    {
+                        case PipingModelType.Bligh:
+                            if (Math.Abs(oneCoreResult.PipingDesignResults.BlighFactor - multiCoreResult.PipingDesignResults.BlighFactor) > tolerance)
+                            {
+                                var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
+                                differencesStringBuilder.AppendLine(diffString);
+                                differences.Add(diffString);
+                            }
+                            break;
+                        case PipingModelType.Sellmeijer4Forces:
+                            if (Math.Abs(oneCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor - multiCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor) > tolerance)
+                            {
+                                var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
+                                differencesStringBuilder.AppendLine(diffString);
+                                differences.Add(diffString);
+                            }
+                            break;
+                        case PipingModelType.SellmeijerVnk:
+                            if (Math.Abs(oneCoreResult.PipingDesignResults.SellmeijerVnkFactor - multiCoreResult.PipingDesignResults.SellmeijerVnkFactor) > tolerance)
+                            {
+                                var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor);
+                                differencesStringBuilder.AppendLine(diffString);
+                                differences.Add(diffString);
+                            }
+                            break;
+                    }
+                }
             }
 
             Assert.IsTrue(differences.Count == 0, "Differences found" + Environment.NewLine + differencesStringBuilder);