Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r6556 -r6584
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6556)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6584)
@@ -191,11 +191,14 @@
         foreach (Location location in locations)
         {
             // Add the soil materials used as dike embankment material in Locations
-            if (!location.DikeEmbankmentMaterial.IsNullOrEmpty() && !usedSoils.Any(usedSoil => string.Equals(usedSoil.Name, location.DikeEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)))
+            if (!(location.DikeEmbankmentMaterial == null ||  !location.DikeEmbankmentMaterial.Any()) && 
+                 !usedSoils.Any(usedSoil => string.Equals(usedSoil.Name, location.DikeEmbankmentMaterial, 
+                 StringComparison.OrdinalIgnoreCase)))
             {
                 try
                 {
-                    usedSoils.Add(allSoils.First(soil => string.Equals(soil.Name, location.DikeEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)));
+                    usedSoils.Add(allSoils.First(soil => string.Equals(soil.Name, location.DikeEmbankmentMaterial, 
+                                                                       StringComparison.OrdinalIgnoreCase)));
                 }
                 catch (Exception e)
                 {
@@ -205,11 +208,14 @@
             }
 
             // Add the soil materials used as shoulder embankment material in Locations
-            if (!location.ShoulderEmbankmentMaterial.IsNullOrEmpty() && !usedSoils.Any(usedSoil => string.Equals(usedSoil.Name, location.ShoulderEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)))
+            if (!(location.ShoulderEmbankmentMaterial == null || !location.ShoulderEmbankmentMaterial.Any()) && 
+                !usedSoils.Any(usedSoil => string.Equals(usedSoil.Name, location.ShoulderEmbankmentMaterial, 
+                StringComparison.OrdinalIgnoreCase)))
             {
                 try
                 {
-                    usedSoils.Add(allSoils.First(soil => string.Equals(soil.Name, location.ShoulderEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)));
+                    usedSoils.Add(allSoils.First(soil => string.Equals(soil.Name, location.ShoulderEmbankmentMaterial, 
+                                                                       StringComparison.OrdinalIgnoreCase)));
                 }
                 catch (Exception e)
                 {