Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r1ebbb321b20db4b685e64c189203bf48206f3a92 -rd619ae4aa81f29db83eddda6620ce58b47d864af
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision 1ebbb321b20db4b685e64c189203bf48206f3a92)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision d619ae4aa81f29db83eddda6620ce58b47d864af)
@@ -31,6 +31,7 @@
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Primitives;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Data
 {
@@ -299,14 +300,14 @@
                 return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
             }
 
-            IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
-            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput(failureMechanism, assessmentSection);
-            IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies = failureMechanism.SectionResults
-                                                                                             .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection))
-                                                                                             .ToArray();
-
             try
             {
+                IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
+                AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput(failureMechanism, assessmentSection);
+                IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies = failureMechanism.SectionResults
+                                                                                                 .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection))
+                                                                                                 .ToArray();
+
                 IFailureMechanismAssemblyCalculator calculator =
                     calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
 
@@ -316,6 +317,10 @@
             {
                 throw new AssemblyException(e.Message, e);
             }
+            catch (AssemblyException e)
+            {
+                throw new AssemblyException(RingtoetsCommonDataResources.FailureMechanismAssemblyFactory_Error_while_assembling_failureMechanism, e);
+            }
         }
 
         /// <summary>