Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r2456 -r2460
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 2456)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 2460)
@@ -697,10 +697,22 @@
         /// <param name="project"></param>
         public void SaveXMLProject(string fileName, object project)
         {
-            var damProject = project as DamProject;
+            // Try to retrieve the data source folder from this object.
             string dataSourceFolder = null;
-            if (damProject != null)
+            if (DamProjectData != null)
             {
+                string damDataSourceFilePath = DamProjectData.DamDataSourceFileName;
+                dataSourceFolder = string.IsNullOrEmpty(damDataSourceFilePath)
+                    ? damDataSourceFilePath
+                    : Path.GetDirectoryName(damDataSourceFilePath);
+            }
+
+            // If the data source is not available, try to retrieve it from
+            // the argument. The data source folder must be set in order to
+            // create the geometries 2D.0 folder 
+            var damProject = project as DamProject;
+            if (damProject != null && dataSourceFolder == null)
+            {
                 dataSourceFolder = Path.GetDirectoryName(damProject.DamProjectData.DamDataSourceFileName);
             }