Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r6873 -r6880
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 6873)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 6880)
@@ -300,15 +300,12 @@
     /// <param name="mapName">Name of the map.</param>
     public void AssignGeometry2DMapnameIfNotAssigned(string mapName)
     {
-        if (damProjectData.Dike != null)
+        if (damProjectData.Dike != null && String.IsNullOrEmpty(damProjectData.Dike.MapForSoilGeometries2D))
         {
-            if (String.IsNullOrEmpty(damProjectData.Dike.MapForSoilGeometries2D))
+            damProjectData.Dike.MapForSoilGeometries2D = mapName;
+            foreach (Location location in damProjectData.Dike.Locations)
             {
-                damProjectData.Dike.MapForSoilGeometries2D = mapName;
-                foreach (Location location in damProjectData.Dike.Locations)
-                {
-                    location.MapForSoilGeometries2D = mapName;
-                }
+                location.MapForSoilGeometries2D = mapName;
             }
         }
     }