Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r4e9e1bc4a1133138ee51c3a62a885010832f6d7f -r80d36751940e21e14d24b16e6c6e62bcd6615fcd
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingFailureMechanismSectionResultAssemblyFactory.cs)	(revision 4e9e1bc4a1133138ee51c3a62a885010832f6d7f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingFailureMechanismSectionResultAssemblyFactory.cs)	(revision 80d36751940e21e14d24b16e6c6e62bcd6615fcd)
@@ -238,7 +238,7 @@
         /// <param name="failureMechanismSectionResults">The failure mechanism section results to
         /// get the assembly for.</param>
         /// <param name="calculationScenarios">The calculation scenarios belonging to this failure mechanism.</param>
-        /// <param name="failureMechanism">The failure mechanism this to assemble for.</param>
+        /// <param name="failureMechanism">The failure mechanism to assemble for.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> the failure mechanism belongs to.</param>
         /// <param name="considerManualAssembly">Indicator whether the manual assembly should be used in the assembly.</param>
         /// <returns>A <see cref="FailureMechanismAssembly"/>.</returns>
@@ -305,14 +305,10 @@
 
                 return calculator.AssembleFailureMechanism(sectionAssemblies, assemblyCategoriesInput);
             }
-            catch (FailureMechanismSectionAssemblyCalculatorException e)
+            catch (Exception e) when (e is FailureMechanismAssemblyCalculatorException || e is FailureMechanismSectionAssemblyCalculatorException)
             {
                 throw new AssemblyException(e.Message, e);
             }
-            catch (FailureMechanismAssemblyCalculatorException e)
-            {
-                throw new AssemblyException(e.Message, e);
-            }
         }
 
         private static AssemblyCategoriesInput CreateAssemblyCategoriesInput(PipingFailureMechanism failureMechanism,