diff --git a/integration_tests/osrm_route_test.cpp b/integration_tests/osrm_route_test.cpp
index faed8e7f7d..e0fd0957db 100644
--- a/integration_tests/osrm_route_test.cpp
+++ b/integration_tests/osrm_route_test.cpp
@@ -1,4 +1,4 @@
-#include "../../testing/testing.hpp"
+#include "../testing/testing.hpp"
 
 #include "osrm_test_tools.hpp"
 
@@ -19,4 +19,10 @@ namespace
     integration::CalculateRouteAndTestRouteLength(routerComponents,  {37.409929478750627, 67.644798619710073},
                                                   {0., 0.}, {39.836562407458047, 65.774372510437971}, 253275.);
   }
+  UNIT_TEST(UKRugbyStIvesRouteTest)
+  {
+    shared_ptr<integration::OsrmRouterComponents> routerComponents = integration::GetAllMaps();
+    integration::CalculateRouteAndTestRouteLength(routerComponents,  {-1.2653036222483705, 61.691304855049886},
+                                                  {0., 0.}, {-5.4799407508360218, 58.242809563579847}, 455902.);
+  }
 }
diff --git a/integration_tests/osrm_test_tools.cpp b/integration_tests/osrm_test_tools.cpp
index 6e46b896cd..a1b4656319 100644
--- a/integration_tests/osrm_test_tools.cpp
+++ b/integration_tests/osrm_test_tools.cpp
@@ -1,6 +1,6 @@
 #include "osrm_test_tools.hpp"
 
-#include "../../testing/testing.hpp"
+#include "../testing/testing.hpp"
 
 #include "../indexer/index.hpp"
 
diff --git a/integration_tests/osrm_turn_test.cpp b/integration_tests/osrm_turn_test.cpp
index ab53c8f979..68f0cc220f 100644
--- a/integration_tests/osrm_turn_test.cpp
+++ b/integration_tests/osrm_turn_test.cpp
@@ -1,4 +1,4 @@
-#include "../../testing/testing.hpp"
+#include "../testing/testing.hpp"
 
 #include "osrm_test_tools.hpp"
 
diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp
index 18bc1b581a..b5c33a22a2 100644
--- a/routing/osrm_router.cpp
+++ b/routing/osrm_router.cpp
@@ -189,6 +189,9 @@ public:
     for (int i = si; i != ei; i += di)
     {
       m_mapping.GetSegmentByIndex(i, s);
+      if (!s.IsValid())
+        continue;
+
       auto s1 = min(s.m_pointStart, s.m_pointEnd);
       auto e1 = max(s.m_pointEnd, s.m_pointStart);
 
@@ -638,7 +641,7 @@ m2::PointD OsrmRouter::GetPointByNodeId(const size_t node_id, RoutingMappingPtrT
   else
     routingMapping->m_segMapping.GetSegmentByIndex(nSegs.second - 1, seg);
 
-  if (seg.m_fid == OsrmFtSegMapping::FtSeg::INVALID_FID)
+  if (!seg.IsValid())
     return m2::PointD::Zero();
 
   FeatureType ft;
@@ -1366,6 +1369,8 @@ void OsrmRouter::GetPossibleTurns(NodeID node,
     auto const range = routingMapping->m_segMapping.GetSegmentsRange(trg);
     OsrmFtSegMapping::FtSeg seg;
     routingMapping->m_segMapping.GetSegmentByIndex(range.first, seg);
+    if (!seg.IsValid())
+      continue;
 
     FeatureType ft;
     Index::FeaturesLoaderGuard loader(*m_pIndex, routingMapping->GetMwmId());