Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -rbf3867a5c8ba43b554015933b613cda908734735 -r6ce0630b9c2fc4df24fee43aaab256193c1ae96a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision bf3867a5c8ba43b554015933b613cda908734735)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision 6ce0630b9c2fc4df24fee43aaab256193c1ae96a)
@@ -96,15 +96,15 @@
         }
 
         /// <summary>
-        /// Performs a macro stability inwards calculation based on the supplied <see cref="MacroStabilityInwardsCalculation"/> and sets <see cref="MacroStabilityInwardsCalculation.Output"/>
-        /// based on the result if the calculation was successful. Error and status information is logged during
-        /// the execution of the operation.
+        /// Performs a macro stability inwards calculation based on the supplied <see cref="MacroStabilityInwardsCalculation"/>
+        /// and sets <see cref="MacroStabilityInwardsCalculation.Output"/> based on the result if the calculation was successful.
+        /// Error and status information is logged during the execution of the operation.
         /// </summary>
         /// <param name="calculation">The <see cref="MacroStabilityInwardsCalculation"/> to base the input for the calculation upon.</param>
         /// <param name="normativeAssessmentLevel">The normative assessment level to use in case the manual assessment level is not applicable.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
+        /// <exception cref="UpliftVanCalculatorException">Thrown when an error (both expected or unexpected) occurred during the calculation.</exception>
         /// <remarks>Consider calling <see cref="Validate"/> first to see if calculation is possible.</remarks>
-        /// <exception cref="UpliftVanCalculatorException">Thrown when an error occurred during the calculation.</exception>
         public static void Calculate(MacroStabilityInwardsCalculation calculation, RoundedDouble normativeAssessmentLevel)
         {
             if (calculation == null)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs
===================================================================
diff -u -r7f03cf30ae8d2351d8ddede137406d2bc25ef2ab -r6ce0630b9c2fc4df24fee43aaab256193c1ae96a
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision 7f03cf30ae8d2351d8ddede137406d2bc25ef2ab)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision 6ce0630b9c2fc4df24fee43aaab256193c1ae96a)
@@ -87,6 +87,7 @@
         /// <param name="calculation">The <see cref="PipingCalculation"/> to base the input for the calculation upon.</param>
         /// <param name="normativeAssessmentLevel">The normative assessment level to use in case the manual assessment level is not applicable.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
+        /// <exception cref="PipingCalculatorException">Thrown when an unexpected error occurred during the calculation.</exception>
         /// <remarks>Consider calling <see cref="Validate"/> first to see if calculation is possible.</remarks>
         public static void Calculate(PipingCalculation calculation, RoundedDouble normativeAssessmentLevel)
         {
@@ -119,7 +120,9 @@
             }
             catch (PipingCalculatorException e)
             {
-                CalculationServiceHelper.LogExceptionAsError(Resources.Error_in_piping_calculation, e);
+                CalculationServiceHelper.LogExceptionAsError(RingtoetsCommonServiceResources.CalculationService_Calculate_unexpected_error, e);
+
+                throw;
             }
             finally
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r7f03cf30ae8d2351d8ddede137406d2bc25ef2ab -r6ce0630b9c2fc4df24fee43aaab256193c1ae96a
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7f03cf30ae8d2351d8ddede137406d2bc25ef2ab)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6ce0630b9c2fc4df24fee43aaab256193c1ae96a)
@@ -82,15 +82,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Piping berekening mislukt..
-        /// </summary>
-        internal static string Error_in_piping_calculation {
-            get {
-                return ResourceManager.GetString("Error_in_piping_calculation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Meerdere aaneengesloten watervoerende lagen gevonden. Er wordt geprobeerd de d70 en doorlatendheid van de bovenste watervoerende laag af te leiden..
         /// </summary>
         internal static string PipingCalculationService_GetInputWarnings_Multiple_aquifer_layers_Attempt_to_determine_values_for_DiameterD70_and_DarcyPermeability_from_top_layer {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx
===================================================================
diff -u -r7f03cf30ae8d2351d8ddede137406d2bc25ef2ab -r6ce0630b9c2fc4df24fee43aaab256193c1ae96a
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 7f03cf30ae8d2351d8ddede137406d2bc25ef2ab)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 6ce0630b9c2fc4df24fee43aaab256193c1ae96a)
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Error_in_piping_calculation" xml:space="preserve">
-    <value>Piping berekening mislukt.</value>
-  </data>
   <data name="PipingCalculationService_ValidateInput_Cannot_determine_thickness_aquifer_layer" xml:space="preserve">
     <value>Kan de dikte van het watervoerend pakket niet afleiden op basis van de invoer.</value>
   </data>