diff --git a/td/telegram/AuthManager.cpp b/td/telegram/AuthManager.cpp
index 1a80475af..b47a9f948 100644
--- a/td/telegram/AuthManager.cpp
+++ b/td/telegram/AuthManager.cpp
@@ -845,7 +845,7 @@ void AuthManager::on_log_out_result(NetQueryPtr &result) {
   } else {
     status = std::move(result->error());
   }
-  LOG_IF(ERROR, status.is_error() && status.error().code() != 401) << "Receive error for auth.logOut: " << status;
+  LOG_IF(ERROR, status.is_error() && status.code() != 401) << "Receive error for auth.logOut: " << status;
   // state_ will stay LoggingOut, so no queries will work.
   destroy_auth_keys();
   if (query_id_ != 0) {
@@ -897,7 +897,7 @@ void AuthManager::on_delete_account_result(NetQueryPtr &result) {
   } else {
     status = std::move(result->error());
   }
-  if (status.is_error() && status.error().message() != "USER_DEACTIVATED") {
+  if (status.is_error() && status.message() != "USER_DEACTIVATED") {
     LOG(WARNING) << "Request account.deleteAccount failed: " << status;
     // TODO handle some errors
     if (query_id_ != 0) {
diff --git a/td/telegram/ClientJson.cpp b/td/telegram/ClientJson.cpp
index d66741383..c2ab41774 100644
--- a/td/telegram/ClientJson.cpp
+++ b/td/telegram/ClientJson.cpp
@@ -48,8 +48,7 @@ static std::pair<td_api::object_ptr<td_api::Function>, string> to_request(Slice
   td_api::object_ptr<td_api::Function> func;
   auto status = from_json(func, std::move(json_value));
   if (status.is_error()) {
-    return {get_return_error_function(PSLICE()
-                                      << "Failed to parse JSON object as TDLib request: " << status.error().message()),
+    return {get_return_error_function(PSLICE() << "Failed to parse JSON object as TDLib request: " << status.message()),
             std::move(extra)};
   }
   return std::make_pair(std::move(func), std::move(extra));
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 08874f5d8..92db2c3cf 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -9063,9 +9063,9 @@ void MessagesManager::on_upload_media(FileId file_id, tl_object_ptr<telegram_api
   auto can_send_status = can_send_message(dialog_id);
   if (!is_edit && can_send_status.is_error()) {
     // user has left the chat during upload of the file or lost their privileges
-    LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error();
+    LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status;
 
-    fail_send_message(full_message_id, can_send_status.move_as_error());
+    fail_send_message(full_message_id, std::move(can_send_status));
     return;
   }
 
@@ -9222,9 +9222,9 @@ void MessagesManager::on_load_secret_thumbnail(FileId thumbnail_file_id, BufferS
   auto can_send_status = can_send_message(dialog_id);
   if (can_send_status.is_error()) {
     // secret chat was closed during load of the file
-    LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error();
+    LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status;
 
-    fail_send_message(full_message_id, can_send_status.move_as_error());
+    fail_send_message(full_message_id, std::move(can_send_status));
     return;
   }
 
@@ -9270,9 +9270,9 @@ void MessagesManager::on_upload_thumbnail(FileId thumbnail_file_id,
   auto can_send_status = can_send_message(dialog_id);
   if (!is_edit && can_send_status.is_error()) {
     // user has left the chat during upload of the thumbnail or lost their privileges
-    LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error();
+    LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status;
 
-    fail_send_message(full_message_id, can_send_status.move_as_error());
+    fail_send_message(full_message_id, std::move(can_send_status));
     return;
   }
 
@@ -33697,7 +33697,7 @@ void MessagesManager::send_dialog_action(DialogId dialog_id, MessageId top_threa
     auto can_send_status = can_send_message(dialog_id);
     if (can_send_status.is_error()) {
       if (td_->auth_manager_->is_bot()) {
-        return promise.set_error(can_send_status.move_as_error());
+        return promise.set_error(std::move(can_send_status));
       }
       return promise.set_value(Unit());
     }
@@ -39675,9 +39675,9 @@ MessagesManager::Message *MessagesManager::continue_send_message(DialogId dialog
     can_send_status = Status::Error(400, "Message is too old to be re-sent automatically");
   }
   if (can_send_status.is_error()) {
-    LOG(INFO) << "Can't continue to send a message to " << dialog_id << ": " << can_send_status.error();
+    LOG(INFO) << "Can't continue to send a message to " << dialog_id << ": " << can_send_status;
 
-    fail_send_message({dialog_id, result_message->message_id}, can_send_status.move_as_error());
+    fail_send_message({dialog_id, result_message->message_id}, std::move(can_send_status));
     return nullptr;
   }
 
diff --git a/td/telegram/SecureManager.cpp b/td/telegram/SecureManager.cpp
index 1ad17055a..8770923a7 100644
--- a/td/telegram/SecureManager.cpp
+++ b/td/telegram/SecureManager.cpp
@@ -650,8 +650,8 @@ void SetSecureValue::merge(FileManager *file_manager, FileId file_id, EncryptedS
     LOG(ERROR) << "Hash mismatch";
     return;
   }
-  auto status = file_manager->merge(encrypted_file.file.file_id, file_id);
-  LOG_IF(ERROR, status.is_error()) << status.error();
+  auto r_file_id = file_manager->merge(encrypted_file.file.file_id, file_id);
+  LOG_IF(ERROR, r_file_id.is_error()) << r_file_id.error();
 }
 
 class DeleteSecureValue final : public NetQueryCallback {
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 9ca0702dc..64e4d8426 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -8198,7 +8198,7 @@ td_api::object_ptr<td_api::Object> Td::do_static_request(td_api::parseMarkdown &
   auto entities = r_entities.move_as_ok();
   auto status = fix_formatted_text(request.text_->text_, entities, true, true, true, true, true);
   if (status.is_error()) {
-    return make_error(400, status.error().message());
+    return make_error(400, status.message());
   }
 
   auto parsed_text = parse_markdown_v3({std::move(request.text_->text_), std::move(entities)});
@@ -8225,7 +8225,7 @@ td_api::object_ptr<td_api::Object> Td::do_static_request(td_api::getMarkdownText
   auto entities = r_entities.move_as_ok();
   auto status = fix_formatted_text(request.text_->text_, entities, true, true, true, true, true);
   if (status.is_error()) {
-    return make_error(400, status.error().message());
+    return make_error(400, status.message());
   }
 
   return get_formatted_text_object(get_markdown_v3({std::move(request.text_->text_), std::move(entities)}), false,
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 2ccc85c96..d227d4134 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -1931,9 +1931,9 @@ class CliClient final : public Actor {
       HttpReader http_reader;
       http_reader.init(&reader);
       HttpQuery query;
-      auto status = http_reader.read_next(&query);
-      if (status.is_error()) {
-        LOG(ERROR) << status.error();
+      auto r_size = http_reader.read_next(&query);
+      if (r_size.is_error()) {
+        LOG(ERROR) << r_size.error();
         return;
       }
       string bot_user_id = query.get_arg("bot_id").str();
diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index 8636ee1c2..4aae985f9 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -2208,7 +2208,7 @@ void FileManager::download(FileId file_id, std::shared_ptr<DownloadCallback> cal
   if (node->local_.type() == LocalFileLocation::Type::Full) {
     auto status = check_local_location(node);
     if (status.is_error()) {
-      LOG(WARNING) << "Need to redownload file " << file_id << ": " << status.error();
+      LOG(WARNING) << "Need to redownload file " << file_id << ": " << status;
     } else {
       LOG(INFO) << "File " << file_id << " is already downloaded";
       if (callback) {
@@ -2219,7 +2219,7 @@ void FileManager::download(FileId file_id, std::shared_ptr<DownloadCallback> cal
   } else if (node->local_.type() == LocalFileLocation::Type::Partial) {
     auto status = check_local_location(node);
     if (status.is_error()) {
-      LOG(WARNING) << "Need to download file " << file_id << " from beginning: " << status.error();
+      LOG(WARNING) << "Need to download file " << file_id << " from beginning: " << status;
     }
   }
 
diff --git a/td/telegram/net/Session.cpp b/td/telegram/net/Session.cpp
index 96424d803..47e188787 100644
--- a/td/telegram/net/Session.cpp
+++ b/td/telegram/net/Session.cpp
@@ -426,7 +426,7 @@ void Session::on_bind_result(NetQueryPtr query) {
     auth_data_.on_bind();
     last_bind_success_timestamp_ = Time::now();
     on_tmp_auth_key_updated();
-  } else if (status.error().message() == "DispatchTtlError") {
+  } else if (status.message() == "DispatchTtlError") {
     LOG(INFO) << "Resend bind auth key " << auth_data_.get_tmp_auth_key().id() << " request after DispatchTtlError";
   } else {
     LOG(ERROR) << "BindKey failed: " << status;
@@ -452,7 +452,7 @@ void Session::on_check_key_result(NetQueryPtr query) {
       status = r_flag.move_as_error();
     }
   }
-  if (status.is_ok() || status.error().code() != -404) {
+  if (status.is_ok() || status.code() != -404) {
     LOG(INFO) << "Check main key ok";
     need_check_main_key_ = false;
     auth_data_.set_use_pfs(true);
diff --git a/tddb/td/db/SqliteKeyValue.cpp b/tddb/td/db/SqliteKeyValue.cpp
index cee5994c5..97e2e6fe9 100644
--- a/tddb/td/db/SqliteKeyValue.cpp
+++ b/tddb/td/db/SqliteKeyValue.cpp
@@ -55,7 +55,7 @@ void SqliteKeyValue::set(Slice key, Slice value) {
   set_stmt_.bind_blob(2, value).ensure();
   auto status = set_stmt_.step();
   if (status.is_error()) {
-    LOG(FATAL) << "Failed to set \"" << base64_encode(key) << "\": " << status.error();
+    LOG(FATAL) << "Failed to set \"" << base64_encode(key) << "\": " << status;
   }
   set_stmt_.reset();
 }
diff --git a/tdutils/td/utils/AsyncFileLog.cpp b/tdutils/td/utils/AsyncFileLog.cpp
index 38f1b8c26..7d6354da0 100644
--- a/tdutils/td/utils/AsyncFileLog.cpp
+++ b/tdutils/td/utils/AsyncFileLog.cpp
@@ -45,7 +45,7 @@ Status AsyncFileLog::init(string path, int64 rotate_threshold) {
           if (size > rotate_threshold) {
             auto status = rename(path, PSLICE() << path << ".old");
             if (status.is_error()) {
-              process_fatal_error(PSLICE() << status.error() << " in " << __FILE__ << " at " << __LINE__ << '\n');
+              process_fatal_error(PSLICE() << status << " in " << __FILE__ << " at " << __LINE__ << '\n');
             }
             after_rotation();
           }
diff --git a/tdutils/td/utils/FileLog.cpp b/tdutils/td/utils/FileLog.cpp
index 3d3d92efb..1452c6bf9 100644
--- a/tdutils/td/utils/FileLog.cpp
+++ b/tdutils/td/utils/FileLog.cpp
@@ -77,7 +77,7 @@ void FileLog::do_append(int log_level, CSlice slice) {
   if (size_ > rotate_threshold_ || want_rotate_.load(std::memory_order_relaxed)) {
     auto status = rename(path_, PSLICE() << path_ << ".old");
     if (status.is_error()) {
-      process_fatal_error(PSLICE() << status.error() << " in " << __FILE__ << " at " << __LINE__ << '\n');
+      process_fatal_error(PSLICE() << status << " in " << __FILE__ << " at " << __LINE__ << '\n');
     }
     do_after_rotation();
   }