Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs
===================================================================
diff -u -r5203 -r5206
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs	(.../GeometryGenerator.cs)	(revision 5203)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs	(.../GeometryGenerator.cs)	(revision 5206)
@@ -1007,6 +1007,8 @@
 
     private void MergePoints()
     {
+        //try
+        //{
         int count = geometryData.Points.Count;
         List<GeometryCurve> aConnectedAtHeadCurveList = new List<GeometryCurve>();
         List<GeometryCurve> aConnectedAtEndCurveList = new List<GeometryCurve>();
@@ -1036,6 +1038,11 @@
                 }
             }
         }
+        //}
+        // catch (Exception ex)
+        // {
+        //   LogManager.Add(new LogMessage(LogMessageType.FatalError, (object) this, "MergePoints: " + ex.Message));
+        // }
         geometryData.NewlyEffectedPoints.Clear();
     }
 
@@ -1065,7 +1072,7 @@
             DetermineFlagValues5to8(pointXz1, pointXz3, pointXz2, pointXz4, ref flag5, ref flag6, ref flag7, ref flag8);
         }
 
-        if (flag3 && flag4 || flag1 && flag2 || flag1 || flag2 && flag3 || flag4)
+        if (flag3 && flag4 || flag1 && flag2 || flag1 | flag2 && flag3 || flag4)
         {
             if (flag1 && !flag2 && !flag5 && !flag7)
             {