diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp
index 976b10aed1..9f5395386c 100644
--- a/routing/index_graph.cpp
+++ b/routing/index_graph.cpp
@@ -106,14 +106,14 @@ void IndexGraph::GetLastPointsForJoint(SegmentListT const & children,
                                        bool isOutgoing,
                                        PointIdListT & lastPoints) const
 {
-  CHECK(lastPoints.empty(), ());
+  ASSERT(lastPoints.empty(), ());
 
   lastPoints.reserve(children.size());
   for (auto const & child : children)
   {
     uint32_t const startPointId = child.GetPointId(!isOutgoing /* front */);
     uint32_t const pointsNumber = GetRoadGeometry(child.GetFeatureId()).GetPointsCount();
-    CHECK_LESS(startPointId, pointsNumber, ());
+    CHECK_LESS(startPointId, pointsNumber, (child));
 
     uint32_t endPointId;
     // child.IsForward() == isOutgoing
diff --git a/routing/single_vehicle_world_graph.cpp b/routing/single_vehicle_world_graph.cpp
index 625978b1d1..d978fa08e8 100644
--- a/routing/single_vehicle_world_graph.cpp
+++ b/routing/single_vehicle_world_graph.cpp
@@ -37,7 +37,6 @@ void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & par
                                                              WeightListT & parentWeights,
                                                              bool isOutgoing)
 {
-  bool opposite = !isOutgoing;
   JointEdgeListT newCrossMwmEdges;
 
   NumMwmId const mwmId = parent.GetMwmId();
@@ -58,7 +57,7 @@ void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & par
     for (auto const & twin : twins)
     {
       NumMwmId const twinMwmId = twin.GetMwmId();
-      Segment const start(twinMwmId, twin.GetFeatureId(), target.GetSegmentId(!opposite), target.IsForward());
+      Segment const start(twinMwmId, twin.GetFeatureId(), target.GetSegmentId(isOutgoing), target.IsForward());
 
       auto & twinIndexGraph = GetIndexGraph(twinMwmId);
 
@@ -67,7 +66,7 @@ void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & par
       ASSERT_EQUAL(lastPoints.size(), 1, ());
 
       if (auto edge = currentIndexGraph.GetJointEdgeByLastPoint(parent,
-                                                                target.GetSegment(!opposite),
+                                                                target.GetSegment(isOutgoing),
                                                                 isOutgoing, lastPoints.back()))
       {
         newCrossMwmEdges.emplace_back(*edge);