Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r6855 -r6873
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 6855)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 6873)
@@ -145,7 +145,7 @@
 
     private static void CreateDesignResultsFromOutput(Output output, DamProjectData damProjectData)
     {
-        if (damProjectData.WaterBoard.Dike != null)
+        if (damProjectData.Dike != null)
         {
             // Design results
             damProjectData.DesignCalculations = new List<CsvExportData>();
@@ -161,7 +161,7 @@
                 {
                     DamFailureMechanismeCalculation = damProjectData.DamProjectCalculationSpecification.CurrentSpecification, // vanuit invoer
                     AnalysisType = DamProjectCalculationSpecification.SelectedAnalysisType, //is vanuit invoer
-                    DikeName = damProjectData.WaterBoard.Dike.Name, 
+                    DikeName = damProjectData.Dike.Name, 
                     CalculationResult = ConversionHelper.ConvertToCalculationResult(designResult.CalculationResult),
                     BaseFileName = designResult.BaseFileName,
                     CalculationSubDir = designResult.CalculationSubDir,
@@ -348,7 +348,7 @@
 
     private static Scenario GetScenarioByName(DamProjectData damProjectData, string locationName, string scenarioName)
     {
-        List<Location> locations = damProjectData.Locations;
+        List<Location> locations = damProjectData.Locations.ToList();
         foreach (Location location in locations)
         {
             if (location.Name == locationName)
@@ -368,7 +368,7 @@
 
     private static SoilProfile1D GetSoilProfileByName(DamProjectData damProjectData, string profileName)
     {
-        IList<SoilProfile1D> soilProfiles1D = damProjectData.WaterBoard.Dike.SoilProfiles;
+        IList<SoilProfile1D> soilProfiles1D = damProjectData.Dike.SoilProfiles;
         foreach (SoilProfile1D soilProfile1D in soilProfiles1D)
         {
             if (soilProfile1D.Name == profileName)