diff --git a/src/Databases/IDatabase.cpp b/src/Databases/IDatabase.cpp
index 7d12ae6c588..09640d2f86e 100644
--- a/src/Databases/IDatabase.cpp
+++ b/src/Databases/IDatabase.cpp
@@ -23,11 +23,10 @@ StoragePtr IDatabase::getTable(const String & name, ContextPtr context) const
         return storage;
     TableNameHints hints(this->shared_from_this(), context);
     std::vector<String> names = hints.getHints(name);
-    if (!names.empty())
-    {
+    if (names.empty())
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} does not exist", backQuoteIfNeed(getDatabaseName()), backQuoteIfNeed(name));
+    else
         throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} does not exist. Maybe you meant {}?", backQuoteIfNeed(getDatabaseName()), backQuoteIfNeed(name), backQuoteIfNeed(names[0]));
-    }
-    else throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} does not exist", backQuoteIfNeed(getDatabaseName()), backQuoteIfNeed(name));
 }
 
 std::vector<std::pair<ASTPtr, StoragePtr>> IDatabase::getTablesForBackup(const FilterByNameFunction &, const ContextPtr &) const
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 3baaa182d51..dad455d487b 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -341,14 +341,10 @@ DatabaseAndTable DatabaseCatalog::getTableImpl(
             {
                 TableNameHints hints(this->tryGetDatabase(table_id.getDatabaseName()), getContext());
                 std::vector<String> names = hints.getHints(table_id.getTableName());
-                if (!names.empty())
-                {
-                    /// There is two options: first is to print just the name of the table
-                    /// and the second is to print the result in format: db_name.table_name. I'll comment out the second option below
-                    /// I also leave possibility to print several suggestions
+                if (names.empty())
+                    exception->emplace(Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_id.getNameForLogs()));
+                else
                     exception->emplace(Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist. Maybe you meant {}?", table_id.getNameForLogs(), backQuoteIfNeed(names[0])));
-                }
-                else exception->emplace(Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_id.getNameForLogs()));
             }
             return {};
         }