Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r1231 -r1346
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 1231)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 1346)
@@ -67,7 +67,7 @@
                     );
                 }
             }
-            
+
             // Transfer calculation messages
             if (output != null && output.Results != null && output.Results.CalculationMessages != null)
             {
@@ -278,58 +278,61 @@
                         SafetyFactor = outputLocationResult.RegionalScenariosResult.SafetyFactor
                     };
                     var regionalScenarioResults = new List<RWScenarioResult>();
-                    foreach (var outPutRegionalScenarioResult in outputLocationResult.RegionalScenariosResult.RegionalScenarioResult)
+                    if (outputLocationResult.RegionalScenariosResult.RegionalScenarioResult != null)
                     {
-                        var regionalScenarioResult = new RWScenarioResult
+                        foreach (var outPutRegionalScenarioResult in outputLocationResult.RegionalScenariosResult.RegionalScenarioResult)
                         {
-                            CalculationResult = ConversionHelper.ConvertToCalculationResult(outPutRegionalScenarioResult.CalculationResult),
-                            DikeDrySensitivity = ConversionHelper.ConvertToDikeDrySensitivity(outPutRegionalScenarioResult.DikeDrySensitivity),
-                            HydraulicShortcutType = ConversionHelper.ConvertToHydraulicShortcutType(outPutRegionalScenarioResult.HydraulicShortcutType),
-                            LoadSituation = ConversionHelper.ConvertToLoadSituation(outPutRegionalScenarioResult.LoadSituation),
-                            ModelOption = ConversionHelper.ConvertToMStabModelType(outPutRegionalScenarioResult.ModelOption),
-                            SafetyFactor = outPutRegionalScenarioResult.SafetyFactor,
-                            ScenarioType = ConversionHelper.ConvertToScenarioType(outPutRegionalScenarioResult.ScenarioType),
-                            UpliftType = ConversionHelper.ConvertToUpliftType(outPutRegionalScenarioResult.UpliftType)
-                        };
-                        var regionalScenarioProfileResults = new List<RWScenarioProfileResult>();
-                        foreach (var outPutRegionalScenarioProfileResult in outPutRegionalScenarioResult.RegionalScenarioProfileResults)
-                        {
-
-                            var locationName = outPutRegionalScenarioProfileResult.LocationName;
-                            location = damProjectData.WaterBoard.Dikes[0].Locations.FirstOrDefault(x => x.Name == locationName);
-                            var spName = outPutRegionalScenarioProfileResult.SoilProfileName;
-                            var soilGeometryProbability = location.Segment.SoilProfileProbabilities.FirstOrDefault(s => ((s.SegmentFailureMechanismType == null) ||
-                                                                                                                            (s.SegmentFailureMechanismType.Value == FailureMechanismSystemType.StabilityInside)) &&
-                                                                                                                        (s.SoilGeometryName == spName));
-                            var regionalScenarioProfileResult = new RWScenarioProfileResult()
+                            var regionalScenarioResult = new RWScenarioResult
                             {
-                                Location = location,
-                                SoilGeometryProbability = soilGeometryProbability,
-                                LoadSituation = ConversionHelper.ConvertToLoadSituation(outPutRegionalScenarioProfileResult.LoadSituation),
-                                DikeDrySensitivity = ConversionHelper.ConvertToDikeDrySensitivity(outPutRegionalScenarioProfileResult.DikeDrySensitivity),
-                                HydraulicShortcutType = ConversionHelper.ConvertToHydraulicShortcutType(outPutRegionalScenarioProfileResult.HydraulicShortcutType),
-                                UpliftType = ConversionHelper.ConvertToUpliftType(outPutRegionalScenarioProfileResult.UpliftType),
-                                MstabModelOption = ConversionHelper.ConvertToMStabModelType(outPutRegionalScenarioProfileResult.MStabModelOption),
-                                PipingModelOption = ConversionHelper.ConvertToPipingModelType(outPutRegionalScenarioProfileResult.PipingModelOption),
-                                ScenarioType = ConversionHelper.ConvertToScenarioType(outPutRegionalScenarioProfileResult.ScenarioType),
-                                FailureMechanismType = ConversionHelper.ConvertToFailureMechanismSystemType(outPutRegionalScenarioProfileResult.FailureMechanismType),
-                                BaseFileName = outPutRegionalScenarioProfileResult.BaseFileName,
-                                RwResultType = ConversionHelper.ConvertToRegionalResultType(outPutRegionalScenarioProfileResult.RegionalResult.RegionalResultType),
-                                SafetyFactor = outPutRegionalScenarioProfileResult.RegionalResult.SafetyFactor,
-                                ProbabilityOfFailure = outPutRegionalScenarioProfileResult.RegionalResult.ProbabilityOfFailure,
-                                CalculationResult = ConversionHelper.ConvertToCalculationResult(outPutRegionalScenarioProfileResult.RegionalResult.CalculationResult)
+                                CalculationResult = ConversionHelper.ConvertToCalculationResult(outPutRegionalScenarioResult.CalculationResult),
+                                DikeDrySensitivity = ConversionHelper.ConvertToDikeDrySensitivity(outPutRegionalScenarioResult.DikeDrySensitivity),
+                                HydraulicShortcutType = ConversionHelper.ConvertToHydraulicShortcutType(outPutRegionalScenarioResult.HydraulicShortcutType),
+                                LoadSituation = ConversionHelper.ConvertToLoadSituation(outPutRegionalScenarioResult.LoadSituation),
+                                ModelOption = ConversionHelper.ConvertToMStabModelType(outPutRegionalScenarioResult.ModelOption),
+                                SafetyFactor = outPutRegionalScenarioResult.SafetyFactor,
+                                ScenarioType = ConversionHelper.ConvertToScenarioType(outPutRegionalScenarioResult.ScenarioType),
+                                UpliftType = ConversionHelper.ConvertToUpliftType(outPutRegionalScenarioResult.UpliftType)
                             };
-                            regionalScenarioProfileResults.Add(regionalScenarioProfileResult);
+                            var regionalScenarioProfileResults = new List<RWScenarioProfileResult>();
+                            foreach (var outPutRegionalScenarioProfileResult in outPutRegionalScenarioResult.RegionalScenarioProfileResults)
+                            {
+
+                                var locationName = outPutRegionalScenarioProfileResult.LocationName;
+                                location = damProjectData.WaterBoard.Dikes[0].Locations.FirstOrDefault(x => x.Name == locationName);
+                                var spName = outPutRegionalScenarioProfileResult.SoilProfileName;
+                                var soilGeometryProbability = location.Segment.SoilProfileProbabilities.FirstOrDefault(s => ((s.SegmentFailureMechanismType == null) ||
+                                                                                                                                (s.SegmentFailureMechanismType.Value == FailureMechanismSystemType.StabilityInside)) &&
+                                                                                                                            (s.SoilGeometryName == spName));
+                                var regionalScenarioProfileResult = new RWScenarioProfileResult()
+                                {
+                                    Location = location,
+                                    SoilGeometryProbability = soilGeometryProbability,
+                                    LoadSituation = ConversionHelper.ConvertToLoadSituation(outPutRegionalScenarioProfileResult.LoadSituation),
+                                    DikeDrySensitivity = ConversionHelper.ConvertToDikeDrySensitivity(outPutRegionalScenarioProfileResult.DikeDrySensitivity),
+                                    HydraulicShortcutType = ConversionHelper.ConvertToHydraulicShortcutType(outPutRegionalScenarioProfileResult.HydraulicShortcutType),
+                                    UpliftType = ConversionHelper.ConvertToUpliftType(outPutRegionalScenarioProfileResult.UpliftType),
+                                    MstabModelOption = ConversionHelper.ConvertToMStabModelType(outPutRegionalScenarioProfileResult.MStabModelOption),
+                                    PipingModelOption = ConversionHelper.ConvertToPipingModelType(outPutRegionalScenarioProfileResult.PipingModelOption),
+                                    ScenarioType = ConversionHelper.ConvertToScenarioType(outPutRegionalScenarioProfileResult.ScenarioType),
+                                    FailureMechanismType = ConversionHelper.ConvertToFailureMechanismSystemType(outPutRegionalScenarioProfileResult.FailureMechanismType),
+                                    BaseFileName = outPutRegionalScenarioProfileResult.BaseFileName,
+                                    RwResultType = ConversionHelper.ConvertToRegionalResultType(outPutRegionalScenarioProfileResult.RegionalResult.RegionalResultType),
+                                    SafetyFactor = outPutRegionalScenarioProfileResult.RegionalResult.SafetyFactor,
+                                    ProbabilityOfFailure = outPutRegionalScenarioProfileResult.RegionalResult.ProbabilityOfFailure,
+                                    CalculationResult = ConversionHelper.ConvertToCalculationResult(outPutRegionalScenarioProfileResult.RegionalResult.CalculationResult)
+                                };
+                                regionalScenarioProfileResults.Add(regionalScenarioProfileResult);
+                            }
+                            regionalScenarioResult.RWScenarioProfileResults.AddRange(regionalScenarioProfileResults);
+                            regionalScenarioResults.Add(regionalScenarioResult);
                         }
-                        regionalScenarioResult.RWScenarioProfileResults.AddRange(regionalScenarioProfileResults);
-                        regionalScenarioResults.Add(regionalScenarioResult);
+                        locationJob.LocationResult.RWScenariosResult.RWScenarioResults.AddRange(regionalScenarioResults);
+                        //locationJob.Location = location;
+                        var curjob = damProjectData.LocationJobs.FirstOrDefault(x => x.Location.Name == location.Name);
+                        curjob.LocationResult = locationJob.LocationResult;
+                        //damProjectData.LocationJobs.Add(locationJob);
                     }
-                    locationJob.LocationResult.RWScenariosResult.RWScenarioResults.AddRange(regionalScenarioResults);
                 }
-                //locationJob.Location = location;
-                var curjob = damProjectData.LocationJobs.FirstOrDefault(x => x.Location.Name == location.Name);
-                curjob.LocationResult = locationJob.LocationResult;
-                //damProjectData.LocationJobs.Add(locationJob);
             }
         }
     }