Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r4373 -r4412
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 4373)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 4412)
@@ -486,14 +486,18 @@
             }
         }
 
-        // Set locations for scenarios
+        // Set location name for scenarios
         foreach (Location location in project.Dike.Locations)
         {
             foreach (DesignScenario designScenario in location.Scenarios)
             {
-                designScenario.Location = location;
+                designScenario.LocationName = location.Name;
             }
 
+            if (location.CurrentScenario == null)
+            {
+                location.CurrentScenario = location.Scenarios[0];
+            }
             location.SoilList = project.Dike.SoilList;
         }
     }