Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r09d021c34699fb2a6d296ba36713751b1041fa69 -rb191ba8d4fd2ee45ca4b60b87e84cd99a83d68cf
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableFailureMechanismSectionResultRow.cs	(.../AdoptableFailureMechanismSectionResultRow.cs)	(revision 09d021c34699fb2a6d296ba36713751b1041fa69)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableFailureMechanismSectionResultRow.cs	(.../AdoptableFailureMechanismSectionResultRow.cs)	(revision b191ba8d4fd2ee45ca4b60b87e84cd99a83d68cf)
@@ -188,7 +188,7 @@
 
         public override void Update()
         {
-            UpdateDerivedData();
+            UpdateAssemblyData();
             UpdateColumnStateDefinitions();
             UpdateInitialFailureMechanismResultErrors();
         }
@@ -200,17 +200,20 @@
                 ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = initialFailureMechanismResultErrorProvider.GetProbabilityValidationError(
                     calculateInitialFailureMechanismResultProbabilityFunc);
             }
+            else
+            {
+                ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = string.Empty;
+            }
         }
 
-        private void UpdateDerivedData()
+        private void UpdateAssemblyData()
         {
-            ResetErrorTexts();
+            ResetAssemblyResultErrorTexts();
             TryGetAssemblyResult();
         }
 
-        private void ResetErrorTexts()
+        private void ResetAssemblyResultErrorTexts()
         {
-            ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = string.Empty;
             ColumnStateDefinitions[sectionProbabilityIndex].ErrorText = string.Empty;
             ColumnStateDefinitions[assemblyGroupIndex].ErrorText = string.Empty;
         }
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs
===================================================================
diff -u -rc55df96bc3b32ae62a7e0ad6c798c2906144f075 -rb191ba8d4fd2ee45ca4b60b87e84cd99a83d68cf
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs	(.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs)	(revision c55df96bc3b32ae62a7e0ad6c798c2906144f075)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs	(.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs)	(revision b191ba8d4fd2ee45ca4b60b87e84cd99a83d68cf)
@@ -268,7 +268,7 @@
 
         public override void Update()
         {
-            UpdateDerivedData();
+            UpdateAssemblyData();
             UpdateColumnStateDefinitions();
             UpdateInitialFailureMechanismResultErrors();
         }
@@ -282,18 +282,21 @@
                 ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = initialFailureMechanismResultErrorProvider.GetProbabilityValidationError(
                     calculateProbabilityStrategy.CalculateSectionProbability);
             }
+            else
+            {
+                ColumnStateDefinitions[initialFailureMechanismResultProfileProbabilityIndex].ErrorText = string.Empty;
+                ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = string.Empty;
+            }
         }
 
-        private void UpdateDerivedData()
+        private void UpdateAssemblyData()
         {
-            ResetErrorTexts();
+            ResetAssemblyResultErrorTexts();
             TryGetAssemblyResult();
         }
 
-        private void ResetErrorTexts()
+        private void ResetAssemblyResultErrorTexts()
         {
-            ColumnStateDefinitions[initialFailureMechanismResultProfileProbabilityIndex].ErrorText = string.Empty;
-            ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = string.Empty;
             ColumnStateDefinitions[profileProbabilityIndex].ErrorText = string.Empty;
             ColumnStateDefinitions[sectionProbabilityIndex].ErrorText = string.Empty;
             ColumnStateDefinitions[sectionNIndex].ErrorText = string.Empty;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r03baf9da99395b8f83ea1aad8c9e8cab73569c24 -rb191ba8d4fd2ee45ca4b60b87e84cd99a83d68cf
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismSectionResultRow.cs	(.../NonAdoptableFailureMechanismSectionResultRow.cs)	(revision 03baf9da99395b8f83ea1aad8c9e8cab73569c24)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismSectionResultRow.cs	(.../NonAdoptableFailureMechanismSectionResultRow.cs)	(revision b191ba8d4fd2ee45ca4b60b87e84cd99a83d68cf)
@@ -165,19 +165,18 @@
 
         public override void Update()
         {
-            UpdateDerivedData();
+            UpdateAssemblyData();
             UpdateColumnStateDefinitions();
         }
 
-        private void UpdateDerivedData()
+        private void UpdateAssemblyData()
         {
-            ResetErrorTexts();
+            ResetAssemblyResultErrorTexts();
             TryGetAssemblyResult();
         }
 
-        private void ResetErrorTexts()
+        private void ResetAssemblyResultErrorTexts()
         {
-            ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = string.Empty;
             ColumnStateDefinitions[sectionProbabilityIndex].ErrorText = string.Empty;
             ColumnStateDefinitions[assemblyGroupIndex].ErrorText = string.Empty;
         }