Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r3809 -r3810
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 3809)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 3810)
@@ -50,6 +50,8 @@
         /// <returns></returns>
         public static Input CreateInput(DamProjectData damProjectData)
         {
+            // First of all, check that there is a dike
+            ThrowHelper.ThrowIfArgumentNull(damProjectData.WaterBoard, nameof(damProjectData.WaterBoard), StringResourceNames.NoDikeDefined);
             Dike dike = damProjectData.WaterBoard.Dikes[0];
             // Process locations
             string soilProfileDirectory = Path.Combine(damProjectData.ProjectPath, dike.MapForSoilGeometries2D);
@@ -362,7 +364,6 @@
 
         private static void ValidateDamProjectData(DamProjectData damProjectData, List<Location> selectedLocations) 
         {
-            ThrowHelper.ThrowIfArgumentNull(damProjectData.WaterBoard, nameof(damProjectData.WaterBoard), StringResourceNames.NoDikeDefined);
             if (damProjectData.WaterBoard.Dikes == null || damProjectData.WaterBoard.Dikes.Count != 1)
             {
                 throw new ArgumentException(Resources.DikeShouldContainExactly1Dike);