Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs
===================================================================
diff -u -r99c27ad8eff584aeedf3530027726af5474da4fe -r8be12941c9471d7aa287b24b2cbc2c6fa61b15b6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs	(.../AssemblyResultControl.Designer.cs)	(revision 99c27ad8eff584aeedf3530027726af5474da4fe)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs	(.../AssemblyResultControl.Designer.cs)	(revision 8be12941c9471d7aa287b24b2cbc2c6fa61b15b6)
@@ -56,7 +56,7 @@
             this.GroupPanel = new System.Windows.Forms.TableLayoutPanel();
             this.GroupLabel = new Core.Common.Controls.BorderedLabel();
             this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
-            this.warningProvider = new System.Windows.Forms.ErrorProvider(this.components);
+            this.manualAssemblyWarningProvider = new System.Windows.Forms.ErrorProvider(this.components);
             this.GroupPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
             this.SuspendLayout();
@@ -97,9 +97,9 @@
             // 
             // warningProvider
             // 
-            this.warningProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
-            this.warningProvider.ContainerControl = this;
-            this.warningProvider.Icon = global::Ringtoets.Common.Forms.Properties.Resources.PencilWarning;
+            this.manualAssemblyWarningProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+            this.manualAssemblyWarningProvider.ContainerControl = this;
+            this.manualAssemblyWarningProvider.Icon = global::Ringtoets.Common.Forms.Properties.Resources.PencilWarning;
             // 
             // AssemblyResultControl
             // 
@@ -112,7 +112,7 @@
             this.GroupPanel.ResumeLayout(false);
             this.GroupPanel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.warningProvider)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.manualAssemblyWarningProvider)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -121,7 +121,7 @@
         #endregion
         protected System.Windows.Forms.TableLayoutPanel GroupPanel;
         private System.Windows.Forms.ErrorProvider errorProvider;
-        private System.Windows.Forms.ErrorProvider warningProvider;
+        private System.Windows.Forms.ErrorProvider manualAssemblyWarningProvider;
         protected BorderedLabel GroupLabel;
     }
 }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.cs
===================================================================
diff -u -r602252658dcfe6cacca8ea7257323e560b9d1418 -r8be12941c9471d7aa287b24b2cbc2c6fa61b15b6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.cs	(.../AssemblyResultControl.cs)	(revision 602252658dcfe6cacca8ea7257323e560b9d1418)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.cs	(.../AssemblyResultControl.cs)	(revision 8be12941c9471d7aa287b24b2cbc2c6fa61b15b6)
@@ -22,6 +22,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using Ringtoets.Common.Forms.Properties;
 
 namespace Ringtoets.Common.Forms.Controls
 {
@@ -61,20 +62,12 @@
         }
 
         /// <summary>
-        /// Sets the warning message of the control.
+        /// Sets a manual assembly warning message on the control.
         /// </summary>
-        /// <param name="warningMessage">The warning message to set.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="warningMessage"/>
-        /// is <c>null</c>.</exception>
-        public void SetWarning(string warningMessage)
+        public void SetManualAssemblyWarning()
         {
-            if (warningMessage == null)
-            {
-                throw new ArgumentNullException(nameof(warningMessage));
-            }
-
-            warningProvider.SetIconPadding(this, string.IsNullOrEmpty(errorProvider.GetError(this)) ? 4 : 24);
-            warningProvider.SetError(this, warningMessage);
+            manualAssemblyWarningProvider.SetIconPadding(this, string.IsNullOrEmpty(errorProvider.GetError(this)) ? 4 : 24);
+            manualAssemblyWarningProvider.SetError(this, Resources.ManualAssemblyWarning_FailureMechanismAssemblyResult_is_based_on_manual_assemblies);
         }
 
         /// <summary>
@@ -83,7 +76,7 @@
         public void ClearMessages()
         {
             errorProvider.SetError(this, string.Empty);
-            warningProvider.SetError(this, string.Empty);
+            manualAssemblyWarningProvider.SetError(this, string.Empty);
         }
 
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r99c27ad8eff584aeedf3530027726af5474da4fe -r8be12941c9471d7aa287b24b2cbc2c6fa61b15b6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 99c27ad8eff584aeedf3530027726af5474da4fe)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8be12941c9471d7aa287b24b2cbc2c6fa61b15b6)
@@ -1773,16 +1773,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen..
-        /// </summary>
-        public static string FailureMechanismResultView_UpdateFailureMechanismAssemblyResultControl_FailureMechanismAssemblyResult_is_based_on_manual_assemblies {
-            get {
-                return ResourceManager.GetString("FailureMechanismResultView_UpdateFailureMechanismAssemblyResultControl_FailureMec" +
-                        "hanismAssemblyResult_is_based_on_manual_assemblies", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Overschrijf
         ///toetsoordeel.
         /// </summary>
@@ -2514,6 +2504,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen..
+        /// </summary>
+        public static string ManualAssemblyWarning_FailureMechanismAssemblyResult_is_based_on_manual_assemblies {
+            get {
+                return ResourceManager.GetString("ManualAssemblyWarning_FailureMechanismAssemblyResult_is_based_on_manual_assemblie" +
+                        "s", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap MapsIcon {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r99c27ad8eff584aeedf3530027726af5474da4fe -r8be12941c9471d7aa287b24b2cbc2c6fa61b15b6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 99c27ad8eff584aeedf3530027726af5474da4fe)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 8be12941c9471d7aa287b24b2cbc2c6fa61b15b6)
@@ -1464,7 +1464,7 @@
   <data name="StructuresInputFailureMechanismContext_ModelFactorLongThreshold_Description" xml:space="preserve">
     <value>Modelfactor voor een lange overlaat.</value>
   </data>
-  <data name="FailureMechanismResultView_UpdateFailureMechanismAssemblyResultControl_FailureMechanismAssemblyResult_is_based_on_manual_assemblies" xml:space="preserve">
+  <data name="ManualAssemblyWarning_FailureMechanismAssemblyResult_is_based_on_manual_assemblies" xml:space="preserve">
     <value>Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.</value>
   </data>
   <data name="PencilWarning" type="System.Resources.ResXFileRef, System.Windows.Forms">
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -r2891a3121d54d65a44bdb140f27ad310f8e5f913 -r8be12941c9471d7aa287b24b2cbc2c6fa61b15b6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 2891a3121d54d65a44bdb140f27ad310f8e5f913)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 8be12941c9471d7aa287b24b2cbc2c6fa61b15b6)
@@ -211,7 +211,7 @@
 
             if (HasManualAssemblyResults())
             {
-                FailureMechanismAssemblyResultControl.SetWarning(Resources.FailureMechanismResultView_UpdateFailureMechanismAssemblyResultControl_FailureMechanismAssemblyResult_is_based_on_manual_assemblies);
+                FailureMechanismAssemblyResultControl.SetManualAssemblyWarning();
             }
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs
===================================================================
diff -u -r99c27ad8eff584aeedf3530027726af5474da4fe -r8be12941c9471d7aa287b24b2cbc2c6fa61b15b6
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs	(.../AssemblyResultControlTest.cs)	(revision 99c27ad8eff584aeedf3530027726af5474da4fe)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs	(.../AssemblyResultControlTest.cs)	(revision 8be12941c9471d7aa287b24b2cbc2c6fa61b15b6)
@@ -65,10 +65,10 @@
                 Assert.AreEqual(ErrorBlinkStyle.NeverBlink, errorProvider.BlinkStyle);
                 Assert.IsEmpty(errorProvider.GetError(resultControl));
 
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                TestHelper.AssertImagesAreEqual(Resources.PencilWarning.ToBitmap(), warningProvider.Icon.ToBitmap());
-                Assert.AreEqual(ErrorBlinkStyle.NeverBlink, warningProvider.BlinkStyle);
-                Assert.IsEmpty(warningProvider.GetError(resultControl));
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(resultControl);
+                TestHelper.AssertImagesAreEqual(Resources.PencilWarning.ToBitmap(), manualAssemblyWarningProvider.Icon.ToBitmap());
+                Assert.AreEqual(ErrorBlinkStyle.NeverBlink, manualAssemblyWarningProvider.BlinkStyle);
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(resultControl));
             }
         }
 
@@ -105,41 +105,24 @@
         }
 
         [Test]
-        public void SetWarning_WarningMessageNull_ThrowsArgumentNullException()
+        public void SetManualAssemblyWarning_Always_SetsWarningMessageOnControl()
         {
             // Setup
             using (var resultControl = new TestAssemblyResultControl())
             {
                 // Call
-                TestDelegate test = () => resultControl.SetWarning(null);
+                resultControl.SetManualAssemblyWarning();
 
                 // Assert
-                var exception = Assert.Throws<ArgumentNullException>(test);
-                Assert.AreEqual("warningMessage", exception.ParamName);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(resultControl);
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(resultControl));
             }
         }
 
         [Test]
-        [TestCase("random warning 123")]
-        [TestCase("")]
-        public void SetWarning_WithWarningMessage_SetsWarningMessageOnControl(string warningMessage)
-        {
-            // Setup
-            using (var resultControl = new TestAssemblyResultControl())
-            {
-                // Call
-                resultControl.SetWarning(warningMessage);
-
-                // Assert
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                Assert.AreEqual(warningMessage, warningProvider.GetError(resultControl));
-            }
-        }
-
-        [Test]
         [TestCase(true, 24)]
         [TestCase(false, 4)]
-        public void GivenControlWithOrWithoutErrorMessage_WhenSetWarning_ThenWarningSetWithExpectedPadding(bool hasError, int expectedPadding)
+        public void GivenControlWithOrWithoutErrorMessage_WhenManualAssemblyWarningSet_ThenWarningSetWithExpectedPadding(bool hasError, int expectedPadding)
         {
             // Given
             using (var resultControl = new TestAssemblyResultControl())
@@ -154,22 +137,22 @@
                 Assert.AreEqual(hasError, !string.IsNullOrEmpty(errorProvider.GetError(resultControl)));
 
                 // When
-                resultControl.SetWarning("Warning");
+                resultControl.SetManualAssemblyWarning();
 
                 // Then
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                Assert.AreEqual(expectedPadding, warningProvider.GetIconPadding(resultControl));
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(resultControl);
+                Assert.AreEqual(expectedPadding, manualAssemblyWarningProvider.GetIconPadding(resultControl));
             }
         }
 
         [Test]
-        public void GivenControlWithMessages_WhenClearMessages_ThenMessagesCleared()
+        public void GivenControlWithMessages_WhenMessagesCleared_ThenMessagesCleared()
         {
             // Given
             using (var resultControl = new TestAssemblyResultControl())
             {
                 resultControl.SetError("Error");
-                resultControl.SetWarning("Warning");
+                resultControl.SetManualAssemblyWarning();
 
                 // When
                 resultControl.ClearMessages();
@@ -178,8 +161,8 @@
                 ErrorProvider errorProvider = GetErrorProvider(resultControl);
                 Assert.IsEmpty(errorProvider.GetError(resultControl));
 
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                Assert.IsEmpty(warningProvider.GetError(resultControl));
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(resultControl);
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(resultControl));
             }
         }
 
@@ -192,7 +175,7 @@
                 Control groupLabel = GetGroupPanel(resultControl).GetControlFromPosition(0, 0);
                 groupLabel.Text = "abcd";
                 groupLabel.BackColor = Color.Yellow;
-
+                
                 // Call
                 resultControl.ClearAssemblyResult();
 
@@ -207,9 +190,9 @@
             return TypeUtils.GetField<ErrorProvider>(resultControl, "errorProvider");
         }
 
-        private static ErrorProvider GetWarningProvider(AssemblyResultControl resultControl)
+        private static ErrorProvider GetManualAssemblyWarningProvider(AssemblyResultControl resultControl)
         {
-            return TypeUtils.GetField<ErrorProvider>(resultControl, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(resultControl, "manualAssemblyWarningProvider");
         }
 
         private static TableLayoutPanel GetGroupPanel(AssemblyResultControl resultControl)
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -re307926e2a3a356a01bb80c1333738719ef09d4d -r8be12941c9471d7aa287b24b2cbc2c6fa61b15b6
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision e307926e2a3a356a01bb80c1333738719ef09d4d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision 8be12941c9471d7aa287b24b2cbc2c6fa61b15b6)
@@ -43,6 +43,7 @@
     [TestFixture]
     public class FailureMechanismResultViewTest
     {
+        private const string manualAssemblyWarning = "Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.";
         private Form testForm;
 
         private static IEnumerable<TestCaseData> CellFormattingStates
@@ -367,15 +368,15 @@
             {
                 // Precondition
                 TestAssemblyResultControl resultControl = GetFailureMechanismAssemblyCategoryGroupControl();
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                Assert.IsEmpty(warningProvider.GetError(resultControl));
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(resultControl);
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(resultControl));
 
                 // When
                 view.HasManualSectionAssemblyResults = true;
                 sectionResult.NotifyObservers();
 
                 // Then
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(resultControl));
+                Assert.AreEqual(manualAssemblyWarning, manualAssemblyWarningProvider.GetError(resultControl));
             }
         }
 
@@ -397,8 +398,8 @@
                 ErrorProvider errorProvider = GetErrorProvider(resultControl);
                 Assert.IsEmpty(errorProvider.GetError(resultControl));
 
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                Assert.IsEmpty(warningProvider.GetError(resultControl));
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(resultControl);
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(resultControl));
 
                 // When
                 view.HasManualSectionAssemblyResults = true;
@@ -407,7 +408,7 @@
 
                 // Then
                 Assert.AreEqual("Message", errorProvider.GetError(resultControl));
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(resultControl));
+                Assert.AreEqual(manualAssemblyWarning, manualAssemblyWarningProvider.GetError(resultControl));
             }
         }
 
@@ -457,8 +458,8 @@
                 ErrorProvider errorProvider = GetErrorProvider(resultControl);
                 Assert.AreEqual("Message", errorProvider.GetError(resultControl));
 
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(resultControl));
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(resultControl);
+                Assert.AreEqual(manualAssemblyWarning, manualAssemblyWarningProvider.GetError(resultControl));
 
                 // When
                 view.ThrowExceptionOnUpdate = false;
@@ -467,7 +468,7 @@
 
                 // Then
                 Assert.IsEmpty(errorProvider.GetError(resultControl));
-                Assert.IsEmpty(warningProvider.GetError(resultControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(resultControl));
             }
         }
 
@@ -555,9 +556,9 @@
             return TypeUtils.GetField<ErrorProvider>(resultControl, "errorProvider");
         }
 
-        private static ErrorProvider GetWarningProvider(TestAssemblyResultControl resultControl)
+        private static ErrorProvider GetManualAssemblyWarningProvider(TestAssemblyResultControl resultControl)
         {
-            return TypeUtils.GetField<ErrorProvider>(resultControl, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(resultControl, "manualAssemblyWarningProvider");
         }
 
         private static TestAssemblyResultControl GetFailureMechanismAssemblyCategoryGroupControl()