Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r5153 -r5302
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 5153)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 5302)
@@ -137,7 +137,8 @@
     {
         kernelStabilityInput.MoveGrid = true; // is not in DamEngine but MUST be true as we use the brute force approach.
         kernelStabilityInput.MaximumSliceWidth = 1.0; // is not in DamEngine datamodel
-        kernelStabilityInput.SearchAlgorithm = ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabParameters.SearchMethod);
+        // For Bishop, only Grid is possible however if Bishop/UpliftVan was selected, then the SearchAlgorithm concerns only Uplift-Van
+        kernelStabilityInput.SearchAlgorithm = mStabParameters.Model == MStabModelType.Bishop ? SearchAlgorithm.Grid:  ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabParameters.SearchMethod);
         if (kernelStabilityInput.SearchAlgorithm == SearchAlgorithm.BeeswarmAndLevenbergMarquardt)
         {
             CreateDefaultBeeSwarmOptions(kernelStabilityInput);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r5295 -r5302
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 5295)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 5302)
@@ -282,20 +282,21 @@
                     designResults.Add(designResult);
                 }
             }
-
+            // If no uplift therefore no UpliftVan calculation was made. So add a fictive (empty) design result.
+            else
+            {
+                DesignResult designResultUpliftNoRun = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
+                designResultUpliftNoRun.StabilityDesignResults.StabilityModelType = MStabModelType.UpliftVan;
+                designResultUpliftNoRun.CalculationResult = CalculationResult.NoRun;
+                designResults.Add(designResultUpliftNoRun);
+            }
+            
             int index;
             // add worst result from Bishop/UpliftVan, but only if both succeeded.
             if (designResults[0].CalculationResult == CalculationResult.Succeeded &&
                 designResults[1].CalculationResult == CalculationResult.Succeeded)
             {
-                if (designResults[0].StabilityDesignResults.SafetyFactor <= designResults[1].StabilityDesignResults.SafetyFactor)
-                {
-                    index = 0;
-                }
-                else
-                {
-                    index = 1;
-                }
+                index = designResults[0].StabilityDesignResults.SafetyFactor <= designResults[1].StabilityDesignResults.SafetyFactor ? 0 : 1;
             }
             else if (designResults[0].CalculationResult != CalculationResult.Succeeded)
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r5268 -r5302
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 5268)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 5302)
@@ -367,7 +367,11 @@
                                             string fileName, Calculator calculator, out List<LogMessage> messages)
     {
         macroStabilityOutput.CalculationResult = CalculationResult.NoRun;
-        macroStabilityOutput.StabilityOutputItems = new List<MacroStabilityOutputItem>();
+        if (macroStabilityOutput.StabilityOutputItems == null)
+        {
+            macroStabilityOutput.StabilityOutputItems = new List<MacroStabilityOutputItem>();
+        }
+
         messages = new List<LogMessage>();
         try
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs
===================================================================
diff -u -r4729 -r5302
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 4729)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 5302)
@@ -53,7 +53,6 @@
         macroStabilityOutput.CalculationResult = ConversionHelper.ConvertToDamResultType(kernelOutput.ResultType);
         if (kernelOutput.StabilityOutput != null)
         {
-            macroStabilityOutput.StabilityOutputItems = new List<MacroStabilityOutputItem>();
             var outputItem = new MacroStabilityOutputItem
             {
                 CalculationResult = ConversionHelper.ConvertToDamResultType(kernelOutput.ResultType),