diff --git a/src/BRepFill/BRepFill_Filling.cxx b/src/BRepFill/BRepFill_Filling.cxx
index 420d9dc5e4..4ba10915fd 100644
--- a/src/BRepFill/BRepFill_Filling.cxx
+++ b/src/BRepFill/BRepFill_Filling.cxx
@@ -119,6 +119,12 @@ static TopoDS_Wire WireFromList(TopTools_ListOfShape& Edges)
         break;
       }
     }
+    if (!itl.More())
+    {
+      Message::SendWarning() << "Warning: WireFromList: can't find the next edge. The wire is not "
+                                "complete, some edges are lost.";
+      break;
+    }
     BB.Add(aWire, anEdge);
     Edges.Remove(itl);
   }