Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r4412 -r4414
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 4412)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 4414)
@@ -494,7 +494,7 @@
                 designScenario.LocationName = location.Name;
             }
 
-            if (location.CurrentScenario == null)
+            if (location.CurrentScenario == null && location.Scenarios.Any())
             {
                 location.CurrentScenario = location.Scenarios[0];
             }