diff --git a/routing/routing_quality/routing_quality_tool/benchmark_results.cpp b/routing/routing_quality/routing_quality_tool/benchmark_results.cpp
index 4e8ca6eb09..2723a18b17 100644
--- a/routing/routing_quality/routing_quality_tool/benchmark_results.cpp
+++ b/routing/routing_quality/routing_quality_tool/benchmark_results.cpp
@@ -2,9 +2,9 @@
 
 namespace routing_quality::routing_quality_tool
 {
-double BenchmarkResults::GetAverageBuildTime()
+double BenchmarkResults::GetAverageBuildTime() const
 {
-  auto const n = m_errorCounter[DebugPrint(routing::RouterResultCode::NoError)];
+  auto const n = m_errorCounter.at(routing::ToString(routing::RouterResultCode::NoError));
   if (n == 0)
     return 0.0;
 
diff --git a/routing/routing_quality/routing_quality_tool/benchmark_results.hpp b/routing/routing_quality/routing_quality_tool/benchmark_results.hpp
index 9a5872880b..db54b4ee6f 100644
--- a/routing/routing_quality/routing_quality_tool/benchmark_results.hpp
+++ b/routing/routing_quality/routing_quality_tool/benchmark_results.hpp
@@ -12,7 +12,7 @@ class BenchmarkResults
 {
 public:
   void PushError(routing::RouterResultCode code);
-  double GetAverageBuildTime();
+  double GetAverageBuildTime() const;
   void PushBuildTime(double time);
 
   std::vector<double> const & GetBuildTimes() const { return m_buildTimes; }
diff --git a/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp b/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
index 5b35e47738..6f8bedfe92 100644
--- a/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
+++ b/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
@@ -23,7 +23,7 @@ bool IsErrorCode(RouterResultCode code)
   return code != RouterResultCode::NoError;
 }
 
-void CheckConsistency(RoutesBuilder::Result const & oldRes, RoutesBuilder::Result const & newRes)
+void LogIfNotConsistent(RoutesBuilder::Result const & oldRes, RoutesBuilder::Result const & newRes)
 {
   auto const start = mercator::ToLatLon(oldRes.m_params.m_checkpoints.GetStart());
   auto const finish = mercator::ToLatLon(oldRes.m_params.m_checkpoints.GetFinish());
@@ -149,8 +149,9 @@ void RunBenchmarkComparison(
     if (IsErrorCode(mapsmeResult.m_code) || IsErrorCode(mapsmeOldResult.m_code))
       continue;
 
-    CheckConsistency(mapsmeOldResult, mapsmeResult);
+    LogIfNotConsistent(mapsmeOldResult, mapsmeResult);
 
+    CHECK(!mapsmeOldResult.m_routes.empty() && !mapsmeResult.m_routes.empty(), ());
     auto const etaDiff =
         (mapsmeOldResult.m_routes.back().m_eta - mapsmeResult.m_routes.back().m_eta);
     auto const etaDiffPercent = etaDiff / mapsmeOldResult.m_routes.back().m_eta * 100.0;