Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r6292 -r6294
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6292)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6294)
@@ -187,26 +187,23 @@
 
     private static void DetermineUsedSoilsFromLocations(List<Soil> allSoils, List<Location> locations, List<Soil> usedSoils)
     {
-        // Add the soil materials used as dike embankment material in Locations
         foreach (Location location in locations)
         {
             foreach (Scenario scenario in location.Scenarios)
             {
+                // Add the soil materials used as dike embankment material in Locations
                 if (!usedSoils.Any(usedSoil => string.Equals(usedSoil.Name, scenario.Location.DikeEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)))
                 {
                     usedSoils.Add(allSoils.First(soil => string.Equals(soil.Name, scenario.Location.DikeEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)));
                 }
-            }
-        }
-        
-        // Add the soil materials used as shoulder embankment material in Locations
-        foreach (Location location in locations)
-        {
-            foreach (Scenario scenario in location.Scenarios)
-            {
-                if (!usedSoils.Any(usedSoil => string.Equals(usedSoil.Name, scenario.Location.ShoulderEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)))
-                {
-                    usedSoils.Add(allSoils.First(soil => string.Equals(soil.Name, scenario.Location.ShoulderEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)));
+
+                // Add the soil materials used as shoulder embankment material in Locations
+                if (scenario.Location.ShoulderEmbankmentMaterial != "") {
+                    
+                    if (!usedSoils.Any(usedSoil => string.Equals(usedSoil.Name, scenario.Location.ShoulderEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        usedSoils.Add(allSoils.First(soil => string.Equals(soil.Name, scenario.Location.ShoulderEmbankmentMaterial, StringComparison.OrdinalIgnoreCase)));
+                    }
                 }
             }
         }