Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/ScenariosView.cs
===================================================================
diff -u -r6bdea2261c016e319cf32c6abb1e4a457ecc4efd -reba2456b482bd84aecce96e6d55fc155ebe495bc
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/ScenariosView.cs	(.../ScenariosView.cs)	(revision 6bdea2261c016e319cf32c6abb1e4a457ecc4efd)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/ScenariosView.cs	(.../ScenariosView.cs)	(revision eba2456b482bd84aecce96e6d55fc155ebe495bc)
@@ -177,8 +177,12 @@
                 Observable = CalculationGroup
             };
 
-            calculationObserver = new RecursiveObserver<CalculationGroup, TCalculationScenario>(UpdateScenarioRows, pcg => pcg.Children)
+            calculationObserver = new RecursiveObserver<CalculationGroup, TCalculationScenario>(() =>
             {
+                UpdateScenarioRows();
+                UpdateTotalScenarioContributionLabel();
+            }, pcg => pcg.Children)
+            {
                 Observable = CalculationGroup
             };
 
@@ -240,6 +244,11 @@
 
         private void UpdateTotalScenarioContributionLabel()
         {
+            if (scenarioRows == null)
+            {
+                return;
+            }
+            
             ClearErrorMessage();
 
             double totalScenarioContribution = scenarioRows.Where(r => r.IsRelevant)
@@ -250,7 +259,7 @@
                 SetErrorMessage(Resources.CalculationScenarios_Scenario_contribution_for_this_section_not_100);
             }
 
-            labelTotalScenarioContribution.Text = string.Format(Resources.ScenariosView_Total_contribution_of_relevant_scenarios_for_this_section_is_equal_to_total_scenario_contribution_0_, 
+            labelTotalScenarioContribution.Text = string.Format(Resources.ScenariosView_Total_contribution_of_relevant_scenarios_for_this_section_is_equal_to_total_scenario_contribution_0_,
                                                                 roundedTotalScenarioContribution);
         }