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>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rb85e01707b64280b3aa8a16acd1994c0c2ee1c04 -rd619ae4aa81f29db83eddda6620ce58b47d864af
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision b85e01707b64280b3aa8a16acd1994c0c2ee1c04)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision d619ae4aa81f29db83eddda6620ce58b47d864af)
@@ -806,7 +806,7 @@
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance;
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
@@ -855,7 +855,7 @@
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
-                
+
                 // Call
                 PipingFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(
                     sectionResult,
@@ -868,7 +868,6 @@
             }
         }
 
-
         [Test]
         public void GetSectionAssemblyCategoryGroup_WithoutManualInput_ReturnsOutput()
         {
@@ -919,7 +918,7 @@
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
-                
+
                 // Call
                 FailureMechanismSectionAssemblyCategoryGroup categoryGroup = PipingFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(
                     sectionResult,
@@ -953,7 +952,7 @@
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
-                var calculatorfactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance;
+                var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
                 if (useManualAssembly)
                 {
@@ -1186,8 +1185,8 @@
                 // Assert
                 var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
-                Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
-                Assert.AreEqual(innerException.Message, exception.Message);
+                Assert.IsInstanceOf<AssemblyException>(innerException);
+                Assert.AreEqual("Voor een of meerdere vakken kan geen resultaat worden bepaald.", exception.Message);
                 mocks.VerifyAll();
             }
         }