Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -r7ab53f6dcb03a883a36e174e94c693ca51bec2f5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 7ab53f6dcb03a883a36e174e94c693ca51bec2f5)
@@ -84,8 +84,7 @@
             }
             catch (AssemblyException e)
             {
-                // TODO: Add method besides the AssemblyErrorMessageCreator
-                throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreatorOld.CreateGenericErrorMessage(), e);
+                throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e);
             }
             catch (Exception e)
             {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -r7ab53f6dcb03a883a36e174e94c693ca51bec2f5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 7ab53f6dcb03a883a36e174e94c693ca51bec2f5)
@@ -263,8 +263,9 @@
                 Assert.IsFalse(failureMechanismSectionAssemblyKernel.Calculated);
 
                 var exception = Assert.Throws<FailureMechanismSectionAssemblyCalculatorException>(Call);
-                Assert.IsInstanceOf<AssemblyException>(exception.InnerException);
-                Assert.AreEqual(AssemblyErrorMessageCreatorOld.CreateGenericErrorMessage(), exception.Message);
+                var innerException = exception.InnerException as AssemblyException;
+                Assert.IsNotNull(innerException);
+                Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(innerException.Errors), exception.Message);
             }
         }