diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index 840af975055e2908bd8e8c5d77bf75c8b35d8137..46b1379ef2774e965fc23e27ccf6aa52ed52cd88 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -433,8 +433,12 @@ void End_Curve(Curve *c)
     std::list<Curve*> tmp;
     for (std::vector<int>::const_iterator cIter=c->compound.begin();
          cIter!=c->compound.end();++cIter) {
-      Curve* comp = FindCurve(*cIter);
-      if (!comp) Msg::Error("Could not find curve %d as part of compound edge %d",*cIter,c->Num);
+      Curve* comp;
+      if (!(comp = FindCurve(*cIter))){
+        Msg::Debug("Could not find curve %d as part of compound edge %d. "
+                   "Aborting sort.",*cIter,c->Num);
+        return;
+      }
       tmp.push_back(comp);
     }