diff --git a/generator/locality_sorter.cpp b/generator/locality_sorter.cpp
index 6b0393bea8..6d930373db 100644
--- a/generator/locality_sorter.cpp
+++ b/generator/locality_sorter.cpp
@@ -135,9 +135,12 @@ public:
           vector<m2::PointD> hullPoints = hull.Points();
           holder.SetInner();
           auto const id = fb2.GetMostGenericOsmId();
-          CHECK(holder.TryToMakeStrip(hullPoints),
-                ("Error while building tringles for object with OSM Id:", id.GetSerialId(),
-                 "Type:", id.GetType(), "points:", points, "hull:", hull.Points()));
+          if (!holder.TryToMakeStrip(hullPoints))
+          {
+            LOG(LWARNING, ("Error while building tringles for object with OSM Id:", id.GetSerialId(),
+                           "Type:", id.GetType(), "points:", points, "hull:", hull.Points()));
+            return 0;
+          }
         }
       }
     }