diff --git a/map/routing_session.cpp b/map/routing_session.cpp
index d5b385e3e1..abd8283c2f 100644
--- a/map/routing_session.cpp
+++ b/map/routing_session.cpp
@@ -26,16 +26,27 @@ RoutingSession::RoutingSession()
 void RoutingSession::BuildRoute(m2::PointD const & startPoint, m2::PointD const & endPoint,
                                 TReadyCallbackFn const & callback)
 {
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
   ASSERT(m_router != nullptr, ());
   m_lastGoodPosition = startPoint;
   m_router->SetFinalPoint(endPoint);
-  RebuildRoute(startPoint, callback);
+  RebuildRouteUnprotected(startPoint, callback);
 }
 
 void RoutingSession::RebuildRoute(m2::PointD const & startPoint, TReadyCallbackFn const & callback)
+{
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
+  RebuildRouteUnprotected(startPoint, callback);
+}
+
+void RoutingSession::RebuildRouteUnprotected(m2::PointD const & startPoint, TReadyCallbackFn const & callback)
 {
   ASSERT(m_router != nullptr, ());
-  Reset();
+  ResetUnprotected();
   m_state = RouteBuilding;
 
   // Use old-style callback constraction, because lambda constructs buggy function on Android
@@ -63,7 +74,7 @@ bool RoutingSession::IsNavigable() const
   return (m_state == RouteNotStarted || m_state == OnRoute);
 }
 
-void RoutingSession::Reset()
+void RoutingSession::ResetUnprotected()
 {
   m_state = RoutingNotActive;
   m_lastDistance = 0.0;
@@ -71,9 +82,20 @@ void RoutingSession::Reset()
   Route(string()).Swap(m_route);
 }
 
+void RoutingSession::Reset()
+{
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
+  ResetUnprotected();
+}
+
 RoutingSession::State RoutingSession::OnLocationPositionChanged(m2::PointD const & position,
                                                                 GpsInfo const & info)
 {
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
   ASSERT(m_state != RoutingNotActive, ());
   ASSERT(m_router != nullptr, ());
 
@@ -126,6 +148,9 @@ RoutingSession::State RoutingSession::OnLocationPositionChanged(m2::PointD const
 
 void RoutingSession::GetRouteFollowingInfo(FollowingInfo & info) const
 {
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
   auto formatDistFn = [](double dist, string & value, string & suffix)
   {
     /// @todo Make better formatting of distance and units.
@@ -161,6 +186,9 @@ void RoutingSession::GetRouteFollowingInfo(FollowingInfo & info) const
 
 void RoutingSession::AssignRoute(Route & route)
 {
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
   ASSERT(route.IsValid(), ());
   m_state = RouteNotStarted;
   m_route.Swap(route);
@@ -168,18 +196,27 @@ void RoutingSession::AssignRoute(Route & route)
 
 void RoutingSession::SetRouter(IRouter * router)
 {
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
   m_router.reset(router);
 }
 
 void RoutingSession::DeleteIndexFile(string const & fileName)
 {
-  Reset();
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
+  ResetUnprotected();
   m_router->ClearState();
   (void) my::DeleteFileX(GetPlatform().WritablePathForFile(fileName));
 }
 
 void RoutingSession::MatchLocationToRoute(location::GpsInfo & location) const
 {
+  threads::MutexGuard guard(m_routeSessionMutex);
+  UNUSED_VALUE(guard);
+
   if (m_state != State::OnRoute)
     return;
   m_route.MatchLocationToRoute(location);
diff --git a/map/routing_session.hpp b/map/routing_session.hpp
index 9b0a4edf87..80f86db29b 100644
--- a/map/routing_session.hpp
+++ b/map/routing_session.hpp
@@ -10,6 +10,8 @@
 
 #include "../std/unique_ptr.hpp"
 
+#include "../base/mutex.hpp"
+
 
 namespace routing
 {
@@ -47,8 +49,8 @@ public:
 
   /// @param[in] startPoint and endPoint in mercator
   void BuildRoute(m2::PointD const & startPoint, m2::PointD const & endPoint, TReadyCallbackFn const & callback);
-
   void RebuildRoute(m2::PointD const & startPoint, TReadyCallbackFn const & callback);
+
   bool IsActive() const;
   bool IsNavigable() const;
   void Reset();
@@ -60,6 +62,9 @@ public:
   void MatchLocationToRoute(location::GpsInfo & location) const;
 
 private:
+  void ResetUnprotected();
+  void RebuildRouteUnprotected(m2::PointD const & startPoint, TReadyCallbackFn const & callback);
+
   struct DoReadyCallback
   {
     RoutingSession & m_rs;
@@ -80,6 +85,8 @@ private:
   Route m_route;
   State m_state;
 
+  mutable threads::Mutex m_routeSessionMutex;
+
   /// Current position metrics to check for RouteNeedRebuild state.
   double m_lastDistance;
   int m_moveAwayCounter;
diff --git a/routing/route.cpp b/routing/route.cpp
index 94f6906dfb..6f23c5ec54 100644
--- a/routing/route.cpp
+++ b/routing/route.cpp
@@ -78,10 +78,11 @@ uint32_t Route::GetAllTime() const
 
 uint32_t Route::GetTime() const
 {
+  size_t const polySz = m_poly.GetSize();
   if (m_times.empty() || m_poly.GetSize() == 0)
   {
     ASSERT(!m_times.empty(), ());
-    ASSERT(m_poly.GetSize() != 0, ());
+    ASSERT(polySz != 0, ());
     return 0;
   }
 
@@ -98,6 +99,11 @@ uint32_t Route::GetTime() const
 
   auto distFn = [&](uint32_t start, uint32_t end)
   {
+    if (start > polySz || end > polySz)
+    {
+      ASSERT(false, ());
+      return 0.;
+    }
     double d = 0.0;
     for (uint32_t i = start + 1; i < end; ++i)
       d += MercatorBounds::DistanceOnEarth(m_poly.GetPoint(i - 1), m_poly.GetPoint(i));