Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rbbdeb25d8b1857b3fc69049808136a764a844448 -r0fa4236131a761d4c1563fec75a833ef84f3a845
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision bbdeb25d8b1857b3fc69049808136a764a844448)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 0fa4236131a761d4c1563fec75a833ef84f3a845)
@@ -179,9 +179,7 @@
             {
                 if (project is RiskeerProject riskeerProject)
                 {
-                    AssessmentSection assessmentSection = riskeerProject.AssessmentSection;
-
-                    return new AssessmentSectionStateRootContext(assessmentSection);
+                    return new AssessmentSectionStateRootContext(riskeerProject.AssessmentSection);
                 }
 
                 return null;
@@ -885,10 +883,7 @@
         {
             if (viewData is RiskeerProject project)
             {
-                if (project.AssessmentSection != null)
-                {
-                    yield return project.AssessmentSection;
-                }
+                yield return project.AssessmentSection;
             }
 
             if (viewData is IAssessmentSection assessmentSection)
@@ -1348,14 +1343,14 @@
                 return;
             }
 
-            AssessmentSection section = riskeerProject.AssessmentSection;
-            if (section != null && section.HydraulicBoundaryDatabase.IsLinked())
+            AssessmentSection assessmentSection = riskeerProject.AssessmentSection;
+            if (assessmentSection.HydraulicBoundaryDatabase.IsLinked())
             {
                 string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(
-                    section.HydraulicBoundaryDatabase.FilePath,
-                    section.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath,
-                    section.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
-                    section.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessorClosure);
+                    assessmentSection.HydraulicBoundaryDatabase.FilePath,
+                    assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath,
+                    assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
+                    assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessorClosure);
 
                 if (validationProblem != null)
                 {
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rbbdeb25d8b1857b3fc69049808136a764a844448 -r0fa4236131a761d4c1563fec75a833ef84f3a845
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision bbdeb25d8b1857b3fc69049808136a764a844448)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 0fa4236131a761d4c1563fec75a833ef84f3a845)
@@ -98,10 +98,7 @@
                 SetPlugins(gui);
                 gui.Run();
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-                };
+                var project = new RiskeerProject(new AssessmentSection(AssessmentSectionComposition.Dike));
 
                 // When
                 void Action() => gui.SetProject(project, null);
@@ -140,12 +137,8 @@
                     }
                 };
                 HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 // When
                 void Action() => gui.SetProject(project, null);
 
@@ -173,17 +166,14 @@
                 gui.Run();
 
                 const string nonExistingFile = "not_existing_file";
-
-                var project = new RiskeerProject
+                var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
                 {
-                    AssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
+                    HydraulicBoundaryDatabase =
                     {
-                        HydraulicBoundaryDatabase =
-                        {
-                            FilePath = nonExistingFile
-                        }
+                        FilePath = nonExistingFile
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
                 // When
                 void Action() => gui.SetProject(project, null);
@@ -713,10 +703,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var project = new RiskeerProject
-            {
-                AssessmentSection = assessmentSection
-            };
+            var project = new RiskeerProject(assessmentSection);
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -824,12 +811,8 @@
                         failurePath
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -889,12 +872,8 @@
                         SignalingNorm = signallingNorm
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -946,12 +925,8 @@
                         SignalingNorm = signallingNorm
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1003,12 +978,8 @@
                         calculationsForTargetProbability
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1056,10 +1027,7 @@
                     }
                 };
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
+                var project = new RiskeerProject(assessmentSection);
 
                 gui.SetProject(project, null);
 
@@ -1109,12 +1077,8 @@
                         affectedCalculations
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1163,12 +1127,8 @@
                         affectedCalculations
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1214,12 +1174,8 @@
                         calculations
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1268,12 +1224,8 @@
                         calculationsForTargetProbability
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1322,12 +1274,8 @@
                         affectedCalculations
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1376,12 +1324,8 @@
                         affectedCalculations
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
@@ -1427,12 +1371,8 @@
                         calculations
                     }
                 };
+                var project = new RiskeerProject(assessmentSection);
 
-                var project = new RiskeerProject
-                {
-                    AssessmentSection = assessmentSection
-                };
-
                 gui.SetProject(project, null);
 
                 gui.DocumentViewController.CloseAllViews();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/AssessmentSectionStateInfoTest.cs
===================================================================
diff -u -rdd4df0ae45b4432f07a28a71202af0670e59ecd4 -r0fa4236131a761d4c1563fec75a833ef84f3a845
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/AssessmentSectionStateInfoTest.cs	(.../AssessmentSectionStateInfoTest.cs)	(revision dd4df0ae45b4432f07a28a71202af0670e59ecd4)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/AssessmentSectionStateInfoTest.cs	(.../AssessmentSectionStateInfoTest.cs)	(revision 0fa4236131a761d4c1563fec75a833ef84f3a845)
@@ -61,10 +61,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var project = new RiskeerProject
-            {
-                AssessmentSection = assessmentSection
-            };
+            var project = new RiskeerProject(assessmentSection);
 
             // Call
             object rootData = info.GetRootData(project);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/CalculationsStateInfoTest.cs
===================================================================
diff -u -rdd4df0ae45b4432f07a28a71202af0670e59ecd4 -r0fa4236131a761d4c1563fec75a833ef84f3a845
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/CalculationsStateInfoTest.cs	(.../CalculationsStateInfoTest.cs)	(revision dd4df0ae45b4432f07a28a71202af0670e59ecd4)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/CalculationsStateInfoTest.cs	(.../CalculationsStateInfoTest.cs)	(revision 0fa4236131a761d4c1563fec75a833ef84f3a845)
@@ -61,10 +61,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var project = new RiskeerProject
-            {
-                AssessmentSection = assessmentSection
-            };
+            var project = new RiskeerProject(assessmentSection);
 
             // Call
             object rootData = info.GetRootData(project);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs
===================================================================
diff -u -rdd4df0ae45b4432f07a28a71202af0670e59ecd4 -r0fa4236131a761d4c1563fec75a833ef84f3a845
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs	(.../FailurePathsStateInfoTest.cs)	(revision dd4df0ae45b4432f07a28a71202af0670e59ecd4)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs	(.../FailurePathsStateInfoTest.cs)	(revision 0fa4236131a761d4c1563fec75a833ef84f3a845)
@@ -61,10 +61,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var project = new RiskeerProject
-            {
-                AssessmentSection = assessmentSection
-            };
+            var project = new RiskeerProject(assessmentSection);
 
             // Call
             object rootData = info.GetRootData(project);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/HydraulicLoadsStateInfoTest.cs
===================================================================
diff -u -rdd4df0ae45b4432f07a28a71202af0670e59ecd4 -r0fa4236131a761d4c1563fec75a833ef84f3a845
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/HydraulicLoadsStateInfoTest.cs	(.../HydraulicLoadsStateInfoTest.cs)	(revision dd4df0ae45b4432f07a28a71202af0670e59ecd4)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/HydraulicLoadsStateInfoTest.cs	(.../HydraulicLoadsStateInfoTest.cs)	(revision 0fa4236131a761d4c1563fec75a833ef84f3a845)
@@ -61,10 +61,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var project = new RiskeerProject
-            {
-                AssessmentSection = assessmentSection
-            };
+            var project = new RiskeerProject(assessmentSection);
 
             // Call
             object rootData = info.GetRootData(project);