Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r2908 -r3079
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 2908)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 3079)
@@ -1139,11 +1139,11 @@
         /// <returns></returns>
         public Soil GetDikeEmbankmentSoil()
         {
-            if ((stabilityOptions != null && String.IsNullOrEmpty(stabilityOptions.SoilDatabaseName)) || String.IsNullOrEmpty(DikeEmbankmentMaterial))
+            if (SoilList != null && SoilList.Soils.Count > 0 &&  !String.IsNullOrEmpty(DikeEmbankmentMaterial))
             {
-                return null;
+                return SoilList.GetSoilByName(DikeEmbankmentMaterial);
             }
-            return SoilList.GetSoilByName(DikeEmbankmentMaterial);            
+            return null;
         }
 
         /// <summary>