diff --git a/partners_api/taxi_base.cpp b/partners_api/taxi_base.cpp
index 66817d3da9..35efddcac1 100644
--- a/partners_api/taxi_base.cpp
+++ b/partners_api/taxi_base.cpp
@@ -5,7 +5,10 @@ namespace taxi
 bool ApiItem::AreAllCountriesDisabled(storage::TCountriesVec const & countryIds,
                                       std::string const & city) const
 {
-  if (m_disabledCountries.IsEmpty() || countryIds.empty())
+  if (countryIds.empty())
+    return true;
+
+  if (m_disabledCountries.IsEmpty())
     return false;
 
   bool isCountryDisabled = true;
@@ -18,7 +21,10 @@ bool ApiItem::AreAllCountriesDisabled(storage::TCountriesVec const & countryIds,
 bool ApiItem::IsAnyCountryEnabled(storage::TCountriesVec const & countryIds,
                                   std::string const & city) const
 {
-  if (m_enabledCountries.IsEmpty() || countryIds.empty())
+  if (countryIds.empty())
+    return false;
+
+  if (m_enabledCountries.IsEmpty())
     return true;
 
   for (auto const & countryId : countryIds)
diff --git a/partners_api/taxi_engine.cpp b/partners_api/taxi_engine.cpp
index 6216c586c9..500384186f 100644
--- a/partners_api/taxi_engine.cpp
+++ b/partners_api/taxi_engine.cpp
@@ -3,6 +3,8 @@
 #include "partners_api/uber_api.hpp"
 #include "partners_api/yandex_api.hpp"
 
+#include "geometry/latlon.hpp"
+
 #include "base/macros.hpp"
 #include "base/stl_add.hpp"
 
diff --git a/partners_api/uber_api.cpp b/partners_api/uber_api.cpp
index fa9bc03f76..a1d7ef06b9 100644
--- a/partners_api/uber_api.cpp
+++ b/partners_api/uber_api.cpp
@@ -183,6 +183,16 @@ void ProductMaker::SetPrices(uint64_t const requestId, string const & prices)
   m_prices = make_unique<string>(prices);
 }
 
+void ProductMaker::SetError(uint64_t const requestId, taxi::ErrorCode code)
+{
+  lock_guard<mutex> lock(m_mutex);
+
+  if (requestId != m_requestId)
+    return;
+
+  m_error = make_unique<taxi::ErrorCode>(code);
+}
+
 void ProductMaker::MakeProducts(uint64_t const requestId, ProductsCallback const & successFn,
                                 ErrorProviderCallback const & errorFn)
 {
@@ -190,20 +200,28 @@ void ProductMaker::MakeProducts(uint64_t const requestId, ProductsCallback const
   ASSERT(errorFn, ());
 
   vector<Product> products;
+  unique_ptr<taxi::ErrorCode> error;
   {
     lock_guard<mutex> lock(m_mutex);
 
     if (requestId != m_requestId || !m_times || !m_prices)
       return;
 
-    if (!m_times->empty() && !m_prices->empty())
-      MakeFromJson(m_times->c_str(), m_prices->c_str(), products);
-    else
-      LOG(LWARNING, ("Time or price is empty, time:", *m_times, "; price:", *m_prices));
+    if (!m_error)
+    {
+      if (!m_times->empty() && !m_prices->empty())
+        MakeFromJson(m_times->c_str(), m_prices->c_str(), products);
+
+      if (products.empty())
+        m_error = my::make_unique<taxi::ErrorCode>(ErrorCode::NoProducts);
+    }
+
+    if (m_error)
+      error = my::make_unique<taxi::ErrorCode>(*m_error);
   }
 
-  if (products.empty())
-    errorFn(ErrorCode::NoProducts);
+  if (error)
+    errorFn(*error);
   else
     successFn(products);
 }
@@ -225,10 +243,7 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to,
   {
     string result;
     if (!RawApi::GetEstimatedTime(from, result, baseUrl))
-    {
-      errorFn(ErrorCode::RemoteError);
-      return;
-    }
+      maker->SetError(reqId, ErrorCode::RemoteError);
 
     maker->SetTimes(reqId, result);
     maker->MakeProducts(reqId, successFn, errorFn);
@@ -238,10 +253,7 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to,
   {
     string result;
     if (!RawApi::GetEstimatedPrice(from, to, result, baseUrl))
-    {
-      errorFn(ErrorCode::RemoteError);
-      return;
-    }
+      maker->SetError(reqId, ErrorCode::RemoteError);
 
     maker->SetPrices(reqId, result);
     maker->MakeProducts(reqId, successFn, errorFn);
diff --git a/partners_api/uber_api.hpp b/partners_api/uber_api.hpp
index 82de091300..3a5ef7e11a 100644
--- a/partners_api/uber_api.hpp
+++ b/partners_api/uber_api.hpp
@@ -58,6 +58,7 @@ public:
   void Reset(uint64_t const requestId);
   void SetTimes(uint64_t const requestId, string const & times);
   void SetPrices(uint64_t const requestId, string const & prices);
+  void SetError(uint64_t const requestId, taxi::ErrorCode code);
   void MakeProducts(uint64_t const requestId, ProductsCallback const & successFn,
                     ErrorProviderCallback const & errorFn);
 
@@ -65,6 +66,7 @@ private:
   uint64_t m_requestId = 0;
   unique_ptr<string> m_times;
   unique_ptr<string> m_prices;
+  unique_ptr<taxi::ErrorCode> m_error;
   mutex m_mutex;
 };