Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyCategoryGroupControl.cs
===================================================================
diff -u -ree93ac5bb6cb37107dfbef6ea72287cf67f83cc0 -r56279e3b6da6e7a42da3a4e80ef3a375d715fed6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyCategoryGroupControl.cs	(.../FailureMechanismAssemblyCategoryGroupControl.cs)	(revision ee93ac5bb6cb37107dfbef6ea72287cf67f83cc0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyCategoryGroupControl.cs	(.../FailureMechanismAssemblyCategoryGroupControl.cs)	(revision 56279e3b6da6e7a42da3a4e80ef3a375d715fed6)
@@ -33,7 +33,7 @@
     public class FailureMechanismAssemblyCategoryGroupControl : AssemblyResultControl
     {
         /// <summary>
-        /// Set the value of <paramref name="result"/> on the control.
+        /// Sets the value of <paramref name="result"/> on the control.
         /// </summary>
         /// <param name="result">The <see cref="FailureMechanismAssemblyCategoryGroup"/> to set on the control.</param>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="result"/>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.cs
===================================================================
diff -u -ree93ac5bb6cb37107dfbef6ea72287cf67f83cc0 -r56279e3b6da6e7a42da3a4e80ef3a375d715fed6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.cs	(.../FailureMechanismAssemblyControl.cs)	(revision ee93ac5bb6cb37107dfbef6ea72287cf67f83cc0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.cs	(.../FailureMechanismAssemblyControl.cs)	(revision 56279e3b6da6e7a42da3a4e80ef3a375d715fed6)
@@ -34,7 +34,7 @@
     public class FailureMechanismAssemblyControl : AssemblyResultWithProbabilityControl
     {
         /// <summary>
-        /// Set the values of <paramref name="result"/> on the control.
+        /// Sets the value of <paramref name="result"/> on the control.
         /// </summary>
         /// <param name="result">The <see cref="FailureMechanismAssembly"/> to set on the control.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Controls/AssessmentSectionAssemblyCategoryGroupControl.cs
===================================================================
diff -u -ree93ac5bb6cb37107dfbef6ea72287cf67f83cc0 -r56279e3b6da6e7a42da3a4e80ef3a375d715fed6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Controls/AssessmentSectionAssemblyCategoryGroupControl.cs	(.../AssessmentSectionAssemblyCategoryGroupControl.cs)	(revision ee93ac5bb6cb37107dfbef6ea72287cf67f83cc0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Controls/AssessmentSectionAssemblyCategoryGroupControl.cs	(.../AssessmentSectionAssemblyCategoryGroupControl.cs)	(revision 56279e3b6da6e7a42da3a4e80ef3a375d715fed6)
@@ -34,7 +34,7 @@
     public class AssessmentSectionAssemblyCategoryGroupControl : AssemblyResultControl
     {
         /// <summary>
-        /// Set the value of <paramref name="result"/> on the control.
+        /// Sets the value of <paramref name="result"/> on the control.
         /// </summary>
         /// <param name="result">The <see cref="AssessmentSectionAssemblyCategoryGroup"/> to set on the control.</param>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="result"/>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Controls/AssessmentSectionAssemblyControl.cs
===================================================================
diff -u -ree93ac5bb6cb37107dfbef6ea72287cf67f83cc0 -r56279e3b6da6e7a42da3a4e80ef3a375d715fed6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Controls/AssessmentSectionAssemblyControl.cs	(.../AssessmentSectionAssemblyControl.cs)	(revision ee93ac5bb6cb37107dfbef6ea72287cf67f83cc0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Controls/AssessmentSectionAssemblyControl.cs	(.../AssessmentSectionAssemblyControl.cs)	(revision 56279e3b6da6e7a42da3a4e80ef3a375d715fed6)
@@ -35,7 +35,7 @@
     public class AssessmentSectionAssemblyControl : AssemblyResultWithProbabilityControl
     {
         /// <summary>
-        /// Set the values of <paramref name="result"/> on the control.
+        /// Sets the value of <paramref name="result"/> on the control.
         /// </summary>
         /// <param name="result">The <see cref="AssessmentSectionAssembly"/> to set on the control.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -r2f63c812bb240ed18c030efb1be331f06f74270f -r56279e3b6da6e7a42da3a4e80ef3a375d715fed6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 2f63c812bb240ed18c030efb1be331f06f74270f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 56279e3b6da6e7a42da3a4e80ef3a375d715fed6)
@@ -21,12 +21,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Windows.Forms;
 using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.Views;
 using Core.Common.Util.Extensions;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.DuneErosion.Data;
@@ -160,45 +158,58 @@
             UpdateAssemblyResultControls();
         }
 
-        /// <summary>
-        /// Updates the assembly result controls.
-        /// </summary>
         private void UpdateAssemblyResultControls()
         {
-            totalAssemblyCategoryGroupControl.ClearData();
+            UpdateTotalAssemblyCategoryGroupControl();
+            UpdateFailureMechanismsWithProbabilityAssemblyControl();
+            UpdateFailureMechanismsWithoutProbabilityAssemblyControl();
+        }
+
+        private void UpdateFailureMechanismsWithoutProbabilityAssemblyControl()
+        {
+            failureMechanismsWithoutProbabilityAssemblyControl.ClearData();
+            failureMechanismsWithoutProbabilityAssemblyControl.ClearError();
+
             try
             {
-                totalAssemblyCategoryGroupControl.SetAssemblyResult(
-                    AssessmentSectionAssemblyFactory.AssembleAssessmentSection(AssessmentSection));
-                totalAssemblyCategoryGroupControl.ClearError();
+                failureMechanismsWithoutProbabilityAssemblyControl.SetAssemblyResult(
+                    AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithoutProbability(AssessmentSection));
             }
             catch (AssemblyException e)
             {
-                totalAssemblyCategoryGroupControl.SetError(e.Message);
+                failureMechanismsWithoutProbabilityAssemblyControl.SetError(e.Message);
             }
+        }
 
+        private void UpdateFailureMechanismsWithProbabilityAssemblyControl()
+        {
             failureMechanismsWithProbabilityAssemblyControl.ClearData();
+            failureMechanismsWithProbabilityAssemblyControl.ClearError();
+
             try
             {
                 failureMechanismsWithProbabilityAssemblyControl.SetAssemblyResult(
                     AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithProbability(AssessmentSection));
-                failureMechanismsWithProbabilityAssemblyControl.ClearError();
             }
             catch (AssemblyException e)
             {
                 failureMechanismsWithProbabilityAssemblyControl.SetError(e.Message);
             }
+        }
 
-            failureMechanismsWithoutProbabilityAssemblyControl.ClearData();
+        private void UpdateTotalAssemblyCategoryGroupControl()
+        {
+            totalAssemblyCategoryGroupControl.ClearData();
+            totalAssemblyCategoryGroupControl.ClearError();
+
             try
             {
-                failureMechanismsWithoutProbabilityAssemblyControl.SetAssemblyResult(
-                    AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithoutProbability(AssessmentSection));
-                failureMechanismsWithoutProbabilityAssemblyControl.ClearError();
+                totalAssemblyCategoryGroupControl.SetAssemblyResult(
+                    AssessmentSectionAssemblyFactory.AssembleAssessmentSection(AssessmentSection));
             }
             catch (AssemblyException e)
             {
-                failureMechanismsWithoutProbabilityAssemblyControl.SetError(e.Message);
+                totalAssemblyCategoryGroupControl.SetError(e.Message);
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Controls/AssessmentSectionAssemblyControlTest.cs
===================================================================
diff -u -ree93ac5bb6cb37107dfbef6ea72287cf67f83cc0 -r56279e3b6da6e7a42da3a4e80ef3a375d715fed6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Controls/AssessmentSectionAssemblyControlTest.cs	(.../AssessmentSectionAssemblyControlTest.cs)	(revision ee93ac5bb6cb37107dfbef6ea72287cf67f83cc0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Controls/AssessmentSectionAssemblyControlTest.cs	(.../AssessmentSectionAssemblyControlTest.cs)	(revision 56279e3b6da6e7a42da3a4e80ef3a375d715fed6)
@@ -101,6 +101,7 @@
                 BorderedLabel probabilityLabel = GetProbabilityLabel(resultControl);
                 AssertGroupLabel(result, groupLabel);
                 AssertProbabilityLabel(result, probabilityLabel);
+
                 // Call
                 resultControl.ClearData();