diff --git a/geocoder/geocoder_cli/geocoder_cli.cpp b/geocoder/geocoder_cli/geocoder_cli.cpp
index bf7da7b589..e46475b1a1 100644
--- a/geocoder/geocoder_cli/geocoder_cli.cpp
+++ b/geocoder/geocoder_cli/geocoder_cli.cpp
@@ -28,9 +28,8 @@ void PrintResults(Hierarchy const & hierarchy, vector<Result> const & results)
   {
     if (FLAGS_top >= 0 && i >= FLAGS_top)
       break;
-    Hierarchy::Entry const * e = hierarchy.GetEntryForOsmId(results[i].m_osmId);
     cout << "  " << DebugPrint(results[i]);
-    if (e != nullptr)
+    if (auto const && e = hierarchy.GetEntryForOsmId(results[i].m_osmId))
       cout << " " << DebugPrint(e->m_address);
     cout << endl;
   }