Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -rb49aec40751eb5693981ed75a823b9993b9ab8ec -rbf3867a5c8ba43b554015933b613cda908734735
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision b49aec40751eb5693981ed75a823b9993b9ab8ec)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision bf3867a5c8ba43b554015933b613cda908734735)
@@ -138,29 +138,31 @@
                 {
                     CreateAggregatedLogMessage(Resources.MacroStabilityInwardsCalculationService_Calculate_Errors_in_MacroStabilityInwards_calculation, macroStabilityInwardsResult)
                 });
+
+                CalculationServiceHelper.LogCalculationEnd();
+
+                throw new UpliftVanCalculatorException();
             }
-            else
+
+            if (macroStabilityInwardsResult.CalculationMessages.Any())
             {
-                if (macroStabilityInwardsResult.CalculationMessages.Any())
+                CalculationServiceHelper.LogMessagesAsWarning(new[]
                 {
-                    CalculationServiceHelper.LogMessagesAsWarning(new[]
-                    {
-                        CreateAggregatedLogMessage(Resources.MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwards_calculation, macroStabilityInwardsResult)
-                    });
-                }
-
-                calculation.Output = new MacroStabilityInwardsOutput(
-                    MacroStabilityInwardsSlidingCurveConverter.Convert(macroStabilityInwardsResult.SlidingCurveResult),
-                    MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(macroStabilityInwardsResult.CalculationGridResult),
-                    new MacroStabilityInwardsOutput.ConstructionProperties
-                    {
-                        FactorOfStability = macroStabilityInwardsResult.FactorOfStability,
-                        ZValue = macroStabilityInwardsResult.ZValue,
-                        ForbiddenZonesXEntryMin = macroStabilityInwardsResult.ForbiddenZonesXEntryMin,
-                        ForbiddenZonesXEntryMax = macroStabilityInwardsResult.ForbiddenZonesXEntryMax
-                    });
+                    CreateAggregatedLogMessage(Resources.MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwards_calculation, macroStabilityInwardsResult)
+                });
             }
 
+            calculation.Output = new MacroStabilityInwardsOutput(
+                MacroStabilityInwardsSlidingCurveConverter.Convert(macroStabilityInwardsResult.SlidingCurveResult),
+                MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(macroStabilityInwardsResult.CalculationGridResult),
+                new MacroStabilityInwardsOutput.ConstructionProperties
+                {
+                    FactorOfStability = macroStabilityInwardsResult.FactorOfStability,
+                    ZValue = macroStabilityInwardsResult.ZValue,
+                    ForbiddenZonesXEntryMin = macroStabilityInwardsResult.ForbiddenZonesXEntryMin,
+                    ForbiddenZonesXEntryMax = macroStabilityInwardsResult.ForbiddenZonesXEntryMax
+                });
+
             CalculationServiceHelper.LogCalculationEnd();
         }