Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r595b081a57d13a2eac6ff00a1a7ea5026d15422b -r06800c4b5c53dd8a385a9f15ce44e9c4038a3726
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision 06800c4b5c53dd8a385a9f15ce44e9c4038a3726)
@@ -266,32 +266,21 @@
         /// <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="assemblyCategoriesInput">The input parameters used to determine the assembly categories.</param>
+        /// <returns>A collection of all section assembly results.</returns>
         /// <exception cref="AssemblyException">Thrown when a <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
-        /// <returns>A collection of all section assembly results.</returns>
         private static IEnumerable<FailureMechanismSectionAssembly> AssembleSections(StabilityPointStructuresFailureMechanism failureMechanism,
                                                                                      IAssessmentSection assessmentSection,
                                                                                      AssemblyCategoriesInput assemblyCategoriesInput)
         {
-            IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
-            IFailureMechanismSectionAssemblyCalculator sectionCalculator =
-                calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
-
             var sectionAssemblies = new List<FailureMechanismSectionAssembly>();
 
             foreach (StabilityPointStructuresFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults)
             {
                 FailureMechanismSectionAssembly sectionAssembly;
                 if (sectionResult.UseManualAssemblyProbability)
                 {
-                    try
-                    {
-                        sectionAssembly = sectionCalculator.AssembleManual(sectionResult.ManualAssemblyProbability, assemblyCategoriesInput);
-                    }
-                    catch (FailureMechanismSectionAssemblyCalculatorException e)
-                    {
-                        throw new AssemblyException(e.Message, e);
-                    }
+                    sectionAssembly = AssembleManualAssessment(sectionResult, assemblyCategoriesInput);
                 }
                 else
                 {
@@ -306,6 +295,32 @@
             return sectionAssemblies;
         }
 
+        /// <summary>
+        /// Assembles the manual assembly.
+        /// </summary>
+        /// <param name="sectionResult">The failure mechanism section result to assemble the 
+        /// manual assembly for.</param>
+        /// <param name="assemblyCategoriesInput">The input parameters used to determine the assembly categories.</param>
+        /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// could not be created.</exception>
+        private static FailureMechanismSectionAssembly AssembleManualAssessment(StabilityPointStructuresFailureMechanismSectionResult sectionResult,
+                                                                                AssemblyCategoriesInput assemblyCategoriesInput)
+        {
+            IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
+            IFailureMechanismSectionAssemblyCalculator calculator =
+                calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
+
+            try
+            {
+                return calculator.AssembleManual(sectionResult.ManualAssemblyProbability, assemblyCategoriesInput);
+            }
+            catch (FailureMechanismSectionAssemblyCalculatorException e)
+            {
+                throw new AssemblyException(e.Message, e);
+            }
+        }
+
         private static AssemblyCategoriesInput CreateAssemblyCategoriesInput(StabilityPointStructuresFailureMechanism failureMechanism,
                                                                              IAssessmentSection assessmentSection)
         {