Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r549 -r551
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 549)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 551)
@@ -76,6 +76,13 @@
             {
                 throw new NullReferenceException("No locations defined in the input");
             }
+            foreach (Io.XmlInput.Location location in input.Locations)
+            {
+                if (location.DesignScenarios == null)
+                {
+                    throw new NullReferenceException("No design scenarios defined in location");
+                }
+            }
             if (input.SurfaceLines == null)
             {
                 throw new NullReferenceException("No surfacelines defined in the input");
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r548 -r551
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 548)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 551)
@@ -65,6 +65,13 @@
             {
                 throw new NullReferenceException("No locations defined in this project");
             }
+            foreach (Location location in damProjectData.Dike.Locations)
+            {
+                if (location.Scenarios == null)
+                {
+                    throw new NullReferenceException("No scenarios defined in location");
+                }
+            }
             if (damProjectData.Dike.SurfaceLines2 == null)
             {
                 throw new NullReferenceException("No surfacelines defined in this project");