Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs
===================================================================
diff -u -r4248 -r4468
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs	(.../GeometryData.cs)	(revision 4248)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs	(.../GeometryData.cs)	(revision 4468)
@@ -452,7 +452,7 @@
             geometryGenerator = new GeometryGenerator(this);
         }
 
-        lock (this)
+        lock (Surfaces)
         {
             SynchronizeLoops();
             RemoveDoublesFromNewlyEffectedPointsAndCurves();
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/AndSpecification.cs
===================================================================
diff -u -r4052 -r4468
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/AndSpecification.cs	(.../AndSpecification.cs)	(revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/AndSpecification.cs	(.../AndSpecification.cs)	(revision 4468)
@@ -48,9 +48,8 @@
         bool satisfied = (one.IsSatisfiedBy(candidate) && other.IsSatisfiedBy(candidate));
         if (!satisfied)
         {
-            Description = Description;
+            Description = "This " + one.Description + " AND " + other.Description + " are not satisfied";
         }
-
         return satisfied;
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/OrSpecification.cs
===================================================================
diff -u -r4052 -r4468
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/OrSpecification.cs	(.../OrSpecification.cs)	(revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/OrSpecification.cs	(.../OrSpecification.cs)	(revision 4468)
@@ -47,7 +47,7 @@
         bool isSatisfied = (thisIsSatisfiedBy || otherIsSatisfiedBy);
         if (!isSatisfied)
         {
-            Description = "This " + one.Description + " AND " + other.Description + " are not satisfied";
+            Description = "This " + one.Description + " OR " + other.Description + " are not satisfied";
         }
 
         return isSatisfied;