Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs
===================================================================
diff -u -r5526 -r5527
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs	(.../GeometryData.cs)	(revision 5526)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs	(.../GeometryData.cs)	(revision 5527)
@@ -894,12 +894,9 @@
         {
             for (int j = i; j < curvesAsArray.Length; j++)
             {
-                if (i != j && curvesAsArray[i].LocationEquals(curvesAsArray[j]))
+                if ((i != j && curvesAsArray[i].LocationEquals(curvesAsArray[j])) && !curvesToDelete.Contains(curvesAsArray[j]))
                 {
-                    if (!curvesToDelete.Contains(curvesAsArray[j]))
-                    {
-                        curvesToDelete.Add(curvesAsArray[j]);
-                    }
+                    curvesToDelete.Add(curvesAsArray[j]);
                 }
             }
         }
@@ -937,12 +934,9 @@
         {
             for (int j = i; j < pointsAsArray.Length; j++)
             {
-                if (i != j && pointsAsArray[i].LocationEquals(pointsAsArray[j]))
+                if (i != j && pointsAsArray[i].LocationEquals(pointsAsArray[j]) && !pointsToDelete.Contains(pointsAsArray[j]))
                 {
-                    if (!pointsToDelete.Contains(pointsAsArray[j]))
-                    {
-                        pointsToDelete.Add(pointsAsArray[j]);
-                    }
+                    pointsToDelete.Add(pointsAsArray[j]);
                 }
             }
         }
@@ -1087,12 +1081,9 @@
         else if (geometryObject.GetType() == typeof(GeometryCurve))
         {
             var geometryCurve = (GeometryCurve) geometryObject;
-            if (Curves.IndexOf(geometryCurve) > -1)
+            if ((Curves.IndexOf(geometryCurve) > -1) && Curves.Remove(geometryCurve))
             {
-                if (Curves.Remove(geometryCurve))
-                {
-                    RemoveDeletedCurveFromIsUsedCurveLists(geometryCurve);
-                }
+                RemoveDeletedCurveFromIsUsedCurveLists(geometryCurve);
             }
         }
         else if (geometryObject.GetType() == typeof(GeometryLoop))