Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r992 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 992)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1065)
@@ -25,7 +25,7 @@
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.General.Sensors;
-using Deltares.DamEngine.Data.RWScenarios;
+using Deltares.DamEngine.Data.RegionalAssessmentResults;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Logging;
@@ -45,7 +45,7 @@
         private DamProjectType damProjectType = DamProjectType.Operational;
         private ProgramType programType = ProgramType.MStab;
         private List<LocationJob> jobs = new List<LocationJob>();
-        private List<RWScenarioProfileResult> calculations = null; // will be created and initialized in property
+        private List<RegionalScenarioProfileResult> calculations = null; // will be created and initialized in property
         private List<DesignResult> designCalculations = null;
         private List<RWSchematizationFactorResult> schematizationFactors = null;
         /// <summary>
@@ -165,13 +165,13 @@
             }
         }
         
-        public List<RWScenarioProfileResult> Calculations
+        public List<RegionalScenarioProfileResult> Calculations
         {
             get
             {
                 if (calculations == null)
                 {
-                    calculations = new List<RWScenarioProfileResult>();
+                    calculations = new List<RegionalScenarioProfileResult>();
                     this.UpdateCalculations();
                 }
 
@@ -189,9 +189,9 @@
                 {
                     if (locationJob.HasRWScenarioResults)
                     {
-                        foreach (RWScenarioResult locationResult in locationJob.RWScenarioResults)
+                        foreach (var locationResult in locationJob.RWScenarioResults)
                         {
-                            calculations.AddRange(locationResult.RWScenarioProfileResults);
+                            calculations.AddRange(locationResult.RegionalScenarioProfileResults);
                         }
                     }
                 }                
@@ -335,7 +335,7 @@
         {
             get
             {
-                if (jobs.Count == 0)
+                if (jobs.Count == 0 && dikeJob != null)
                 {
                     foreach (LocationJob locationJob in dikeJob.Jobs)
                     {