Index: DamClients/DamUI/trunk/src/Dam/Data/Location.cs
===================================================================
diff -u -r875 -r1191
--- DamClients/DamUI/trunk/src/Dam/Data/Location.cs	(.../Location.cs)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Data/Location.cs	(.../Location.cs)	(revision 1191)
@@ -1686,7 +1686,9 @@
         [Validate]
         public ValidationResult[] ValidateDikeEmbankmentMaterial()
         {
-            if (DamProjectType == DamProjectType.Design && !HasValidDikeEmbankmentMaterial())
+            if (DamProjectType == DamProjectType.Design &&
+                DamProjectCalculationSpecification.SelectedAnalysisType == AnalysisType.AdaptGeometry &&
+                !HasValidDikeEmbankmentMaterial())
             {
                 return new[]
                 {
@@ -1781,11 +1783,13 @@
         [Validate]
         public ValidationResult[] ValidateShoulderEmbankmentMaterial()
         {
-            if (DamProjectType == DamProjectType.Design && !HasValidShoulderEmbankmentMaterial())
+            if (DamProjectType == DamProjectType.Design &&
+                DamProjectCalculationSpecification.SelectedAnalysisType == AnalysisType.AdaptGeometry &&
+                !HasValidShoulderEmbankmentMaterial())
             {
                 return new[]
                 {
-                    new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "NewDikeTopWidth"), this)
+                    new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "NoShoulderEmbankmentMaterial"), this)
                 };
             }
             else