diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 4d68ff079..170782631 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -62,8 +62,7 @@ bool ChatHandler::HasLowerSecurity(Player* target, ObjectGuid guid, bool strong)
 
     if (!target_session && !target_account)
     {
-        SendSysMessage(LANG_PLAYER_NOT_FOUND);
-        SetSentErrorMessage(true);
+        SendErrorMessage(LANG_PLAYER_NOT_FOUND);
         return true;
     }
 
@@ -92,8 +91,7 @@ bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_ac
     AccountTypes target_ac_sec = AccountTypes(target_sec);
     if (m_session->GetSecurity() < target_ac_sec || (strong && m_session->GetSecurity() <= target_ac_sec))
     {
-        SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
-        SetSentErrorMessage(true);
+        SendErrorMessage(LANG_YOURS_SECURITY_IS_LOW);
         return true;
     }
 
@@ -151,6 +149,18 @@ void ChatHandler::SendSysMessage(uint32 entry)
     SendSysMessage(GetAcoreString(entry));
 }
 
+void ChatHandler::SendErrorMessage(uint32 entry)
+{
+    SendSysMessage(entry);
+    SetSentErrorMessage(true);
+}
+
+void ChatHandler::SendErrorMessage(std::string_view str, bool escapeCharacters)
+{
+    SendSysMessage(str, escapeCharacters);
+    SetSentErrorMessage(true);
+}
+
 bool ChatHandler::_ParseCommands(std::string_view text)
 {
     if (Acore::ChatCommands::TryExecuteCommand(*this, text))
@@ -161,8 +171,7 @@ bool ChatHandler::_ParseCommands(std::string_view text)
         return false;
 
     // Send error message for GMs
-    PSendSysMessage(LANG_CMD_INVALID, STRING_VIEW_FMT_ARG(text));
-    SetSentErrorMessage(true);
+    SendErrorMessage(LANG_CMD_INVALID, STRING_VIEW_FMT_ARG(text));
     return true;
 }
 
@@ -682,8 +691,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, ObjectGuid* p
         std::string name = extractPlayerNameFromLink(args);
         if (name.empty())
         {
-            SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            SetSentErrorMessage(true);
+            SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -725,8 +733,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, ObjectGuid* p
     // some from req. data must be provided (note: name is empty if player not exist)
     if ((!player || !*player) && (!player_guid || !*player_guid) && (!player_name || player_name->empty()))
     {
-        SendSysMessage(LANG_PLAYER_NOT_FOUND);
-        SetSentErrorMessage(true);
+        SendErrorMessage(LANG_PLAYER_NOT_FOUND);
         return false;
     }
 
@@ -839,8 +846,7 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player*& player
         {
             if (!normalizePlayerName(name))
             {
-                PSendSysMessage(LANG_PLAYER_NOT_FOUND);
-                SetSentErrorMessage(true);
+                SendErrorMessage(LANG_PLAYER_NOT_FOUND);
                 return false;
             }
 
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 8972125dd..d6f91bb86 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -74,6 +74,23 @@ public:
         return Acore::StringFormat(GetAcoreString(entry), std::forward<Args>(args)...);
     }
 
+    void SendErrorMessage(uint32 entry);
+    void SendErrorMessage(std::string_view str, bool escapeCharacters);
+
+    template<typename... Args>
+    void SendErrorMessage(char const* fmt, Args&&... args)
+    {
+        PSendSysMessage(fmt, std::forward<Args>(args)...);
+        SetSentErrorMessage(true);
+    }
+
+    template<typename... Args>
+    void SendErrorMessage(uint32 entry, Args&&... args)
+    {
+        PSendSysMessage(entry, std::forward<Args>(args)...);
+        SetSentErrorMessage(true);
+    }
+
     bool _ParseCommands(std::string_view text);
     virtual bool ParseCommands(std::string_view text);
 
diff --git a/src/server/scripts/Commands/PlayerCommand.cpp b/src/server/scripts/Commands/PlayerCommand.cpp
index 4e1453008..d4fd06796 100644
--- a/src/server/scripts/Commands/PlayerCommand.cpp
+++ b/src/server/scripts/Commands/PlayerCommand.cpp
@@ -25,8 +25,7 @@ bool Acore::PlayerCommand::HandleLearnSpellCommand(ChatHandler* handler, Player*
 {
     if (!SpellMgr::IsSpellValid(spell))
     {
-        handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
         return false;
     }
 
@@ -34,14 +33,13 @@ bool Acore::PlayerCommand::HandleLearnSpellCommand(ChatHandler* handler, Player*
     {
         if (targetPlayer == handler->GetPlayer())
         {
-            handler->SendSysMessage(LANG_YOU_KNOWN_SPELL);
+            handler->SendErrorMessage(LANG_YOU_KNOWN_SPELL);
         }
         else
         {
-            handler->PSendSysMessage(LANG_TARGET_KNOWN_SPELL, handler->GetNameLink(targetPlayer).c_str());
+            handler->SendErrorMessage(LANG_TARGET_KNOWN_SPELL, handler->GetNameLink(targetPlayer).c_str());
         }
 
-        handler->SetSentErrorMessage(true);
         return false;
     }
 
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index 44bfe9863..0a3f73591 100644
--- a/src/server/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
@@ -101,8 +101,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -111,8 +110,7 @@ public:
         auto const& masterKey = sSecretMgr->GetSecret(SECRET_TOTP_MASTER_KEY);
         if (!masterKey.IsAvailable())
         {
-            handler->SendSysMessage(LANG_2FA_COMMANDS_NOT_SETUP);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_2FA_COMMANDS_NOT_SETUP);
             return false;
         }
 
@@ -126,15 +124,13 @@ public:
             if (!result)
             {
                 LOG_ERROR("misc", "Account {} not found in login database when processing .account 2fa setup command.", accountId);
-                handler->SendSysMessage(LANG_UNKNOWN_ERROR);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_UNKNOWN_ERROR);
                 return false;
             }
 
             if (!result->Fetch()->IsNull())
             {
-                handler->SendSysMessage(LANG_2FA_ALREADY_SETUP);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_2FA_ALREADY_SETUP);
                 return false;
             }
         }
@@ -167,8 +163,7 @@ public:
         }
 
         // new suggestion, or no token specified, output TOTP parameters
-        handler->PSendSysMessage(LANG_2FA_SECRET_SUGGESTION, Acore::Encoding::Base32::Encode(pair.first->second).c_str());
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_2FA_SECRET_SUGGESTION, Acore::Encoding::Base32::Encode(pair.first->second).c_str());
         return false;
     }
 
@@ -176,8 +171,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -186,8 +180,7 @@ public:
         auto const& masterKey = sSecretMgr->GetSecret(SECRET_TOTP_MASTER_KEY);
         if (!masterKey.IsAvailable())
         {
-            handler->SendSysMessage(LANG_2FA_COMMANDS_NOT_SETUP);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_2FA_COMMANDS_NOT_SETUP);
             return false;
         }
 
@@ -201,16 +194,14 @@ public:
             if (!result)
             {
                 LOG_ERROR("misc", "Account {} not found in login database when processing .account 2fa setup command.", accountId);
-                handler->SendSysMessage(LANG_UNKNOWN_ERROR);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_UNKNOWN_ERROR);
                 return false;
             }
 
             Field* field = result->Fetch();
             if (field->IsNull())
             { // 2FA not enabled
-                handler->SendSysMessage(LANG_2FA_NOT_SETUP);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_2FA_NOT_SETUP);
                 return false;
             }
 
@@ -225,8 +216,7 @@ public:
                 if (!success)
                 {
                     LOG_ERROR("misc", "Account {} has invalid ciphertext in TOTP token.", accountId);
-                    handler->SendSysMessage(LANG_UNKNOWN_ERROR);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_UNKNOWN_ERROR);
                     return false;
                 }
             }
@@ -244,8 +234,7 @@ public:
                 handler->SendSysMessage(LANG_2FA_INVALID_TOKEN);
         }
 
-        handler->SendSysMessage(LANG_2FA_REMOVE_NEED_TOKEN);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_2FA_REMOVE_NEED_TOKEN);
         return false;
     }
 
@@ -253,8 +242,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -265,8 +253,7 @@ public:
         auto expansion = Acore::StringTo<uint8>(exp); //get int anyway (0 if error)
         if (!expansion || *expansion > sWorld->getIntConfig(CONFIG_EXPANSION))
         {
-            handler->SendSysMessage(LANG_IMPROPER_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_IMPROPER_VALUE);
             return false;
         }
 
@@ -306,24 +293,19 @@ public:
                 }
                 break;
             case AOR_NAME_TOO_LONG:
-                handler->SendSysMessage(LANG_ACCOUNT_TOO_LONG);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_TOO_LONG);
                 return false;
             case AOR_PASS_TOO_LONG:
-                handler->SendSysMessage(LANG_ACCOUNT_PASS_TOO_LONG);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_PASS_TOO_LONG);
                 return false;
             case AOR_NAME_ALREADY_EXIST:
-                handler->SendSysMessage(LANG_ACCOUNT_ALREADY_EXIST);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_ALREADY_EXIST);
                 return false;
             case AOR_DB_INTERNAL_ERROR:
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR, accountName);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR, accountName);
                 return false;
             default:
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED, accountName);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_CREATED, accountName);
                 return false;
         }
 
@@ -345,16 +327,14 @@ public:
         std::string accountName = account;
         if (!Utf8ToUpperOnlyLatin(accountName))
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
         uint32 accountId = AccountMgr::GetId(accountName);
         if (!accountId)
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
@@ -371,16 +351,13 @@ public:
                 handler->PSendSysMessage(LANG_ACCOUNT_DELETED, accountName.c_str());
                 break;
             case AOR_NAME_NOT_EXIST:
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
                 return false;
             case AOR_DB_INTERNAL_ERROR:
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR, accountName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR, accountName.c_str());
                 return false;
             default:
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED, accountName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_DELETED, accountName.c_str());
                 return false;
         }
 
@@ -439,8 +416,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -452,16 +428,14 @@ public:
         std::string accountName = _accountName;
         if (!Utf8ToUpperOnlyLatin(accountName))
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
         uint32 accountId = AccountMgr::GetId(accountName);
         if (!accountId)
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
@@ -478,8 +452,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_USE_BOL);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_USE_BOL);
             return false;
         }
 
@@ -499,8 +472,7 @@ public:
                 }
                 else
                 {
-                    handler->PSendSysMessage("No IP2Location information - account not locked");
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage("No IP2Location information - account not locked");
                     return false;
                 }
             }
@@ -515,8 +487,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_USE_BOL);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_USE_BOL);
         return false;
     }
 
@@ -524,8 +495,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_USE_BOL);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_USE_BOL);
             return false;
         }
 
@@ -552,8 +522,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_USE_BOL);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_USE_BOL);
         return false;
     }
 
@@ -561,8 +530,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -572,24 +540,21 @@ public:
 
         if (!oldPassword || !newPassword || !passwordConfirmation)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
         if (!AccountMgr::CheckPassword(handler->GetSession()->GetAccountId(), std::string(oldPassword)))
         {
-            handler->SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
+            handler->SendErrorMessage(LANG_COMMAND_WRONGOLDPASSWORD);
             sScriptMgr->OnFailedPasswordChange(handler->GetSession()->GetAccountId());
-            handler->SetSentErrorMessage(true);
             return false;
         }
 
         if (strcmp(newPassword, passwordConfirmation) != 0)
         {
-            handler->SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
+            handler->SendErrorMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
             sScriptMgr->OnFailedPasswordChange(handler->GetSession()->GetAccountId());
-            handler->SetSentErrorMessage(true);
             return false;
         }
 
@@ -601,13 +566,11 @@ public:
                 sScriptMgr->OnPasswordChange(handler->GetSession()->GetAccountId());
                 break;
             case AOR_PASS_TOO_LONG:
-                handler->SendSysMessage(LANG_PASSWORD_TOO_LONG);
+                handler->SendErrorMessage(LANG_PASSWORD_TOO_LONG);
                 sScriptMgr->OnFailedPasswordChange(handler->GetSession()->GetAccountId());
-                handler->SetSentErrorMessage(true);
                 return false;
             default:
-                handler->SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_NOTCHANGEPASSWORD);
                 return false;
         }
 
@@ -618,8 +581,7 @@ public:
     {
         if (!*args)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -628,8 +590,7 @@ public:
 
         if (!_account || !_secret)
         {
-            handler->SendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -638,16 +599,14 @@ public:
 
         if (!Utf8ToUpperOnlyLatin(accountName))
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
         uint32 targetAccountId = AccountMgr::GetId(accountName);
         if (!targetAccountId)
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
@@ -667,23 +626,20 @@ public:
         auto const& masterKey = sSecretMgr->GetSecret(SECRET_TOTP_MASTER_KEY);
         if (!masterKey.IsAvailable())
         {
-            handler->SendSysMessage(LANG_2FA_COMMANDS_NOT_SETUP);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_2FA_COMMANDS_NOT_SETUP);
             return false;
         }
 
         Optional<std::vector<uint8>> decoded = Acore::Encoding::Base32::Decode(secret);
         if (!decoded)
         {
-            handler->SendSysMessage(LANG_2FA_SECRET_INVALID);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_2FA_SECRET_INVALID);
             return false;
         }
 
         if (128 < (decoded->size() + Acore::Crypto::AES::IV_SIZE_BYTES + Acore::Crypto::AES::TAG_SIZE_BYTES))
         {
-            handler->SendSysMessage(LANG_2FA_SECRET_TOO_LONG);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_2FA_SECRET_TOO_LONG);
             return false;
         }
 
@@ -735,16 +691,14 @@ public:
             accountName = account;
             if (!Utf8ToUpperOnlyLatin(accountName))
             {
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
                 return false;
             }
 
             accountId = AccountMgr::GetId(accountName);
             if (!accountId)
             {
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
                 return false;
             }
         }
@@ -801,8 +755,7 @@ public:
             targetAccountName = arg1;
             if (!Utf8ToUpperOnlyLatin(targetAccountName))
             {
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, targetAccountName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, targetAccountName.c_str());
                 return false;
             }
         }
@@ -811,8 +764,7 @@ public:
         gm = (isAccountNameGiven) ? Acore::StringTo<int32>(arg2).value_or(0) : Acore::StringTo<int32>(arg1).value_or(0);
         if (gm > SEC_CONSOLE)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -830,8 +782,7 @@ public:
         targetSecurity = AccountMgr::GetSecurity(targetAccountId, gmRealmID);
         if (targetSecurity >= playerSecurity || gm >= playerSecurity)
         {
-            handler->SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_YOURS_SECURITY_IS_LOW);
             return false;
         }
 
@@ -847,8 +798,7 @@ public:
 
             if (result)
             {
-                handler->SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_YOURS_SECURITY_IS_LOW);
                 return false;
             }
         }
@@ -856,8 +806,7 @@ public:
         // Check if provided realm.Id.Realm has a negative value other than -1
         if (gmRealmID < -1)
         {
-            handler->SendSysMessage(LANG_INVALID_REALMID);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_REALMID);
             return false;
         }
 
@@ -910,16 +859,14 @@ public:
         std::string accountName = account;
         if (!Utf8ToUpperOnlyLatin(accountName))
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
         uint32 targetAccountId = AccountMgr::GetId(accountName);
         if (!targetAccountId)
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
@@ -930,8 +877,7 @@ public:
 
         if (strcmp(password, passwordConfirmation))
         {
-            handler->SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
             return false;
         }
 
@@ -943,16 +889,13 @@ public:
                 handler->SendSysMessage(LANG_COMMAND_PASSWORD);
                 break;
             case AOR_NAME_NOT_EXIST:
-                handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
                 return false;
             case AOR_PASS_TOO_LONG:
-                handler->SendSysMessage(LANG_PASSWORD_TOO_LONG);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_PASSWORD_TOO_LONG);
                 return false;
             default:
-                handler->SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_NOTCHANGEPASSWORD);
                 return false;
         }
         return true;
diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp
index 070ae2d4f..a7a551a88 100644
--- a/src/server/scripts/Commands/cs_achievement.cpp
+++ b/src/server/scripts/Commands/cs_achievement.cpp
@@ -54,8 +54,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
         target->CompletedAchievement(achievementEntry);
@@ -72,8 +71,7 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp
index 5b0bfd662..909ee8e6a 100644
--- a/src/server/scripts/Commands/cs_arena.cpp
+++ b/src/server/scripts/Commands/cs_arena.cpp
@@ -59,8 +59,7 @@ public:
     {
         if (sArenaTeamMgr->GetArenaTeamByName(name))
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_NAME_EXISTS, name.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_EXISTS, name.c_str());
             return false;
         }
 
@@ -72,8 +71,7 @@ public:
 
         if (Player::GetArenaTeamIdFromDB(captain->GetGUID(), type) != 0)
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_SIZE, captain->GetName().c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_SIZE, captain->GetName().c_str());
             return false;
         }
 
@@ -82,8 +80,7 @@ public:
         if (!arena->Create(captain->GetGUID(), type, name, 4293102085, 101, 4293253939, 4, 4284049911))
         {
             delete arena;
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -99,15 +96,13 @@ public:
 
         if (!arena)
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_NOT_FOUND, teamId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_NOT_FOUND, teamId);
             return false;
         }
 
         if (arena->IsFighting())
         {
-            handler->SendSysMessage(LANG_ARENA_ERROR_COMBAT);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_COMBAT);
             return false;
         }
 
@@ -125,29 +120,25 @@ public:
         ArenaTeam* arena = sArenaTeamMgr->GetArenaTeamByName(oldName);
         if (!arena)
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, oldName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, oldName.c_str());
             return false;
         }
 
         if (sArenaTeamMgr->GetArenaTeamByName(newName))
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_NAME_EXISTS, oldName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_EXISTS, oldName.c_str());
             return false;
         }
 
         if (arena->IsFighting())
         {
-            handler->SendSysMessage(LANG_ARENA_ERROR_COMBAT);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_COMBAT);
             return false;
         }
 
         if (!arena->SetName(newName))
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -161,15 +152,13 @@ public:
         ArenaTeam* arena = sArenaTeamMgr->GetArenaTeamById(teamId);
         if (!arena)
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_NOT_FOUND, teamId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_NOT_FOUND, teamId);
             return false;
         }
 
         if (arena->IsFighting())
         {
-            handler->SendSysMessage(LANG_ARENA_ERROR_COMBAT);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_COMBAT);
             return false;
         }
 
@@ -181,15 +170,13 @@ public:
 
         if (!arena->IsMember(target->GetGUID()))
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_NOT_MEMBER, target->GetName().c_str(), arena->GetName().c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_NOT_MEMBER, target->GetName().c_str(), arena->GetName().c_str());
             return false;
         }
 
         if (arena->GetCaptain() == target->GetGUID())
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_CAPTAIN, target->GetName().c_str(), arena->GetName().c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_CAPTAIN, target->GetName().c_str(), arena->GetName().c_str());
             return false;
         }
 
@@ -207,8 +194,7 @@ public:
         ArenaTeam* arena = sArenaTeamMgr->GetArenaTeamById(teamId);
         if (!arena)
         {
-            handler->PSendSysMessage(LANG_ARENA_ERROR_NOT_FOUND, teamId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ARENA_ERROR_NOT_FOUND, teamId);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp
index d8a596b33..9aa0da608 100644
--- a/src/server/scripts/Commands/cs_ban.cpp
+++ b/src/server/scripts/Commands/cs_ban.cpp
@@ -121,8 +121,7 @@ public:
 
         if (!normalizePlayerName(name))
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -142,8 +141,7 @@ public:
                 break;
             case BAN_NOTFOUND:
                 {
-                    handler->PSendSysMessage(LANG_BAN_NOTFOUND, "character", name.c_str());
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_BAN_NOTFOUND, "character", name.c_str());
                     return false;
                 }
             default:
@@ -187,16 +185,14 @@ public:
             case BAN_ACCOUNT:
                 if (!Utf8ToUpperOnlyLatin(nameOrIP))
                 {
-                    handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
                     return false;
                 }
                 break;
             case BAN_CHARACTER:
                 if (!normalizePlayerName(nameOrIP))
                 {
-                    handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
                     return false;
                 }
                 break;
@@ -242,16 +238,15 @@ public:
                 switch (mode)
                 {
                     default:
-                        handler->PSendSysMessage(LANG_BAN_NOTFOUND, "account", nameOrIP.c_str());
+                        handler->SendErrorMessage(LANG_BAN_NOTFOUND, "account", nameOrIP.c_str());
                         break;
                     case BAN_CHARACTER:
-                        handler->PSendSysMessage(LANG_BAN_NOTFOUND, "character", nameOrIP.c_str());
+                        handler->SendErrorMessage(LANG_BAN_NOTFOUND, "character", nameOrIP.c_str());
                         break;
                     case BAN_IP:
-                        handler->PSendSysMessage(LANG_BAN_NOTFOUND, "ip", nameOrIP.c_str());
+                        handler->SendErrorMessage(LANG_BAN_NOTFOUND, "ip", nameOrIP.c_str());
                         break;
                 }
-                handler->SetSentErrorMessage(true);
                 return false;
             case BAN_LONGER_EXISTS:
                 handler->PSendSysMessage("Unsuccessful! A longer ban is already present on this account!");
@@ -275,8 +270,7 @@ public:
         std::string accountName = nameStr;
         if (!Utf8ToUpperOnlyLatin(accountName))
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
@@ -681,15 +675,13 @@ public:
 
         if (!normalizePlayerName(CharacterName))
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
         if (!sBan->RemoveBanCharacter(CharacterName))
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -722,16 +714,14 @@ public:
             case BAN_ACCOUNT:
                 if (!Utf8ToUpperOnlyLatin(nameOrIP))
                 {
-                    handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
                     return false;
                 }
                 break;
             case BAN_CHARACTER:
                 if (!normalizePlayerName(nameOrIP))
                 {
-                    handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
                     return false;
                 }
                 break;
diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp
index 2610a2c62..6eec1e41b 100644
--- a/src/server/scripts/Commands/cs_bf.cpp
+++ b/src/server/scripts/Commands/cs_bf.cpp
@@ -126,8 +126,7 @@ public:
 
         if (Acore::StringTo<int32>(timeStr).value_or(0) < 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -139,8 +138,7 @@ public:
 
         if (time <= 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_cache.cpp b/src/server/scripts/Commands/cs_cache.cpp
index 6fb0fe94f..9943d3143 100644
--- a/src/server/scripts/Commands/cs_cache.cpp
+++ b/src/server/scripts/Commands/cs_cache.cpp
@@ -53,8 +53,7 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -62,8 +61,7 @@ public:
 
         if (!cache)
         {
-            handler->PSendSysMessage(LANG_COMMAND_CACHE_NOT_FOUND, player->GetName());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_CACHE_NOT_FOUND, player->GetName());
             return false;
         }
 
@@ -84,8 +82,7 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -104,8 +101,7 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp
index c6c3eb700..f3bdf6075 100644
--- a/src/server/scripts/Commands/cs_cast.cpp
+++ b/src/server/scripts/Commands/cs_cast.cpp
@@ -70,15 +70,13 @@ public:
     {
         if (!spell)
         {
-            handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NOSPELLFOUND);
             return false;
         }
 
         if (!SpellMgr::IsSpellValid(spell))
         {
-            handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
             return false;
         }
         return true;
@@ -101,8 +99,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -127,8 +124,7 @@ public:
         Creature* caster = handler->getSelectedCreature();
         if (!caster)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -174,8 +170,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -200,15 +195,13 @@ public:
         Creature* caster = handler->getSelectedCreature();
         if (!caster)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
         if (!caster->GetVictim())
         {
-            handler->SendSysMessage(LANG_SELECTED_TARGET_NOT_HAVE_VICTIM);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECTED_TARGET_NOT_HAVE_VICTIM);
             return false;
         }
 
@@ -233,8 +226,7 @@ public:
         Unit* caster = handler->getSelectedUnit();
         if (!caster)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
index 631e52713..8753bec15 100644
--- a/src/server/scripts/Commands/cs_character.cpp
+++ b/src/server/scripts/Commands/cs_character.cpp
@@ -283,8 +283,7 @@ public:
 
         if (!player || !player->IsConnected())
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -344,29 +343,25 @@ public:
             std::string newName{ *newNameV };
             if (!normalizePlayerName(newName))
             {
-                handler->SendSysMessage(LANG_BAD_VALUE);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_BAD_VALUE);
                 return false;
             }
 
             if (ObjectMgr::CheckPlayerName(newName, true) != CHAR_NAME_SUCCESS)
             {
-                handler->SendSysMessage(LANG_BAD_VALUE);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_BAD_VALUE);
                 return false;
             }
 
             if (sObjectMgr->IsReservedName(newName))
             {
-                handler->SendSysMessage(LANG_RESERVED_NAME);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_RESERVED_NAME);
                 return false;
             }
 
             if (sObjectMgr->IsProfanityName(newName))
             {
-                handler->SendSysMessage(LANG_PROFANITY_NAME);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_PROFANITY_NAME);
                 return false;
             }
 
@@ -375,8 +370,7 @@ public:
             PreparedQueryResult result = CharacterDatabase.Query(stmt);
             if (result)
             {
-                handler->PSendSysMessage(LANG_RENAME_PLAYER_ALREADY_EXISTS, newName.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_RENAME_PLAYER_ALREADY_EXISTS, newName.c_str());
                 return false;
             }
 
@@ -539,8 +533,7 @@ public:
             player = PlayerIdentifier::FromTargetOrSelf(handler);
         if (!player || !player->IsConnected())
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -605,8 +598,7 @@ public:
         // if no characters have been found, output a warning
         if (foundList.empty())
         {
-            handler->SendSysMessage(LANG_CHARACTER_DELETED_LIST_EMPTY);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CHARACTER_DELETED_LIST_EMPTY);
             return false;
         }
 
@@ -634,8 +626,7 @@ public:
 
         if (foundList.empty())
         {
-            handler->SendSysMessage(LANG_CHARACTER_DELETED_LIST_EMPTY);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CHARACTER_DELETED_LIST_EMPTY);
             return false;
         }
 
@@ -669,8 +660,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_CHARACTER_DELETED_ERR_RENAME);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_CHARACTER_DELETED_ERR_RENAME);
         return false;
     }
 
@@ -692,8 +682,7 @@ public:
 
         if (foundList.empty())
         {
-            handler->SendSysMessage(LANG_CHARACTER_DELETED_LIST_EMPTY);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CHARACTER_DELETED_LIST_EMPTY);
             return false;
         }
 
@@ -794,15 +783,13 @@ public:
             // normalize the name if specified and check if it exists
             if (!normalizePlayerName(name))
             {
-                handler->PSendSysMessage(LANG_INVALID_CHARACTER_NAME);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_INVALID_CHARACTER_NAME);
                 return false;
             }
 
             if (ObjectMgr::CheckPlayerName(name, true) != CHAR_NAME_SUCCESS)
             {
-                handler->PSendSysMessage(LANG_INVALID_CHARACTER_NAME);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_INVALID_CHARACTER_NAME);
                 return false;
             }
         }
@@ -811,8 +798,7 @@ public:
         {
             if (sCharacterCache->GetCharacterAccountIdByGuid(ObjectGuid(HighGuid::Player, *characterGUID)))
             {
-                handler->PSendSysMessage(LANG_CHARACTER_GUID_IN_USE, *characterGUID);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_CHARACTER_GUID_IN_USE, *characterGUID);
                 return false;
             }
         }
@@ -832,20 +818,16 @@ public:
             handler->PSendSysMessage(LANG_COMMAND_IMPORT_SUCCESS);
             break;
         case DUMP_FILE_OPEN_ERROR:
-            handler->PSendSysMessage(LANG_FILE_OPEN_FAIL, fileName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_FILE_OPEN_FAIL, fileName.c_str());
             return false;
         case DUMP_FILE_BROKEN:
-            handler->PSendSysMessage(LANG_DUMP_BROKEN, fileName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_DUMP_BROKEN, fileName.c_str());
             return false;
         case DUMP_TOO_MANY_CHARS:
-            handler->PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName().c_str(), account.GetID());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName().c_str(), account.GetID());
             return false;
         default:
-            handler->PSendSysMessage(LANG_COMMAND_IMPORT_FAILED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_IMPORT_FAILED);
             return false;
         }
 
@@ -864,13 +846,11 @@ public:
         case DUMP_SUCCESS:
             break;
         case DUMP_CHARACTER_DELETED:
-            handler->PSendSysMessage(LANG_COMMAND_EXPORT_DELETED_CHAR);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_EXPORT_DELETED_CHAR);
             return false;
         case DUMP_FILE_OPEN_ERROR: // this error code should not happen
         default:
-            handler->PSendSysMessage(LANG_COMMAND_EXPORT_FAILED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_EXPORT_FAILED);
             return false;
         }
 
@@ -879,14 +859,12 @@ public:
         case DUMP_SUCCESS:
             break;
         case DUMP_TOO_MANY_CHARS:
-            handler->PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName().c_str(), account.GetID());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName().c_str(), account.GetID());
             return false;
         case DUMP_FILE_OPEN_ERROR: // this error code should not happen
         case DUMP_FILE_BROKEN: // this error code should not happen
         default:
-            handler->PSendSysMessage(LANG_COMMAND_IMPORT_FAILED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_IMPORT_FAILED);
             return false;
         }
 
@@ -905,16 +883,13 @@ public:
             handler->PSendSysMessage(LANG_COMMAND_EXPORT_SUCCESS);
             break;
         case DUMP_FILE_OPEN_ERROR:
-            handler->PSendSysMessage(LANG_FILE_OPEN_FAIL, fileName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_FILE_OPEN_FAIL, fileName.c_str());
             return false;
         case DUMP_CHARACTER_DELETED:
-            handler->PSendSysMessage(LANG_COMMAND_EXPORT_DELETED_CHAR);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_EXPORT_DELETED_CHAR);
             return false;
         default:
-            handler->PSendSysMessage(LANG_COMMAND_EXPORT_FAILED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_EXPORT_FAILED);
             return false;
         }
 
@@ -1079,8 +1054,7 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -1088,8 +1062,7 @@ public:
         {
             if (AccountMgr::GetCharactersCount(accountId) >= 10)
             {
-                handler->PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, accountName, accountId);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, accountName, accountId);
                 return true;
             }
 
@@ -1111,8 +1084,7 @@ public:
         }
         else
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName);
             return true;
         }
 
diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp
index e6919d0cc..8ba1e0311 100644
--- a/src/server/scripts/Commands/cs_cheat.cpp
+++ b/src/server/scripts/Commands/cs_cheat.cpp
@@ -205,8 +205,7 @@ public:
         Player* chr = handler->getSelectedPlayer();
         if (!chr)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index f6147ab45..6417f8668 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -120,8 +120,7 @@ public:
         CinematicSequencesEntry const* cineSeq = sCinematicSequencesStore.LookupEntry(cinematicId);
         if (!cineSeq)
         {
-            handler->PSendSysMessage(LANG_CINEMATIC_NOT_EXIST, cinematicId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CINEMATIC_NOT_EXIST, cinematicId);
             return false;
         }
 
@@ -147,8 +146,7 @@ public:
     {
         if (!sMovieStore.LookupEntry(movieId))
         {
-            handler->PSendSysMessage(LANG_MOVIE_NOT_EXIST, movieId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_MOVIE_NOT_EXIST, movieId);
             return false;
         }
 
@@ -161,8 +159,7 @@ public:
     {
         if (!sSoundEntriesStore.LookupEntry(soundId))
         {
-            handler->PSendSysMessage(LANG_SOUND_NOT_EXIST, soundId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SOUND_NOT_EXIST, soundId);
             return false;
         }
 
@@ -171,8 +168,7 @@ public:
         Unit* unit = handler->getSelectedUnit();
         if (!unit)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -190,8 +186,7 @@ public:
     {
         if (!sSoundEntriesStore.LookupEntry(musicId))
         {
-            handler->PSendSysMessage(LANG_SOUND_NOT_EXIST, musicId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SOUND_NOT_EXIST, musicId);
             return false;
         }
 
@@ -207,8 +202,7 @@ public:
     {
         if (!visualId)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -286,8 +280,7 @@ public:
         std::ifstream ifs("opcode.txt");
         if (!ifs.is_open())
         {
-            handler->SendSysMessage(LANG_DEBUG_OPCODE_FILE_MISSING);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_DEBUG_OPCODE_FILE_MISSING);
             return false;
         }
 
@@ -398,8 +391,7 @@ public:
                 GameObject* obj = handler->GetNearbyGameObject();
                 if (!obj)
                 {
-                    handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, 0);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, 0);
                     ifs.close();
                     return false;
                 }
@@ -410,8 +402,7 @@ public:
                 GameObject* obj = handler->GetNearbyGameObject();
                 if (!obj)
                 {
-                    handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, 0);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, 0);
                     ifs.close();
                     return false;
                 }
@@ -1036,8 +1027,7 @@ public:
         Unit* unit = handler->getSelectedUnit();
         if (!unit)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -1058,8 +1048,7 @@ public:
         WorldObject* target = handler->getSelectedObject();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -1088,8 +1077,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -1138,8 +1126,7 @@ public:
         Unit* unit = handler->getSelectedUnit();
         if (!unit)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -1174,8 +1161,7 @@ public:
         WorldObject* target = handler->getSelectedObject();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp
index b884565ee..5f58849e4 100644
--- a/src/server/scripts/Commands/cs_deserter.cpp
+++ b/src/server/scripts/Commands/cs_deserter.cpp
@@ -104,8 +104,7 @@ public:
         {
             if (!normalizePlayerName(*playerName))
             {
-                handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
                 return false;
             }
 
@@ -118,8 +117,7 @@ public:
             {
                 if (time)
                 {
-                    handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
                     return false;
                 }
 
@@ -153,8 +151,7 @@ public:
 
         if (duration == 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -172,8 +169,7 @@ public:
             aura = target->AddAura(deserterSpell, target);
             if (!aura)
             {
-                handler->SendSysMessage(LANG_BAD_VALUE);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_BAD_VALUE);
                 return false;
             }
             aura->SetDuration(duration * IN_MILLISECONDS);
@@ -250,8 +246,7 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -279,15 +274,13 @@ public:
 
         if (duration == 0)
         {
-            handler->PSendSysMessage("Player %s does not have %s Deserter.", handler->playerLink(player->GetName()), isInstance ? "Instance" : "Battleground");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Player %s does not have %s Deserter.", handler->playerLink(player->GetName()), isInstance ? "Instance" : "Battleground");
             return true;
         }
 
         if (duration < 0)
         {
-            handler->PSendSysMessage("Permanent %s Deserter has been removed from player %s (GUID %u).", isInstance ? "Instance" : "Battleground", handler->playerLink(player->GetName()), player->GetGUID().GetCounter());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Permanent %s Deserter has been removed from player %s (GUID %u).", isInstance ? "Instance" : "Battleground", handler->playerLink(player->GetName()), player->GetGUID().GetCounter());
             return true;
         }
 
@@ -338,8 +331,7 @@ public:
         // Optimization. Do not execute any further functions or Queries if remainTime is 0.
         if (remainTime == 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp
index 30b28f12e..bdbf3705f 100644
--- a/src/server/scripts/Commands/cs_disable.cpp
+++ b/src/server/scripts/Commands/cs_disable.cpp
@@ -81,8 +81,7 @@ public:
                 {
                     if (!sSpellMgr->GetSpellInfo(entry))
                     {
-                        handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_NOSPELLFOUND);
                         return false;
                     }
                     disableTypeStr = "spell";
@@ -92,8 +91,7 @@ public:
                 {
                     if (!sObjectMgr->GetQuestTemplate(entry))
                     {
-                        handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
                         return false;
                     }
                     disableTypeStr = "quest";
@@ -103,8 +101,7 @@ public:
                 {
                     if (!sMapStore.LookupEntry(entry))
                     {
-                        handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_NOMAPFOUND);
                         return false;
                     }
                     disableTypeStr = "map";
@@ -114,8 +111,7 @@ public:
                 {
                     if (!sBattlemasterListStore.LookupEntry(entry))
                     {
-                        handler->PSendSysMessage(LANG_COMMAND_NO_BATTLEGROUND_FOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_NO_BATTLEGROUND_FOUND);
                         return false;
                     }
                     disableTypeStr = "battleground";
@@ -125,8 +121,7 @@ public:
                 {
                     if (entry > MAX_OUTDOORPVP_TYPES)
                     {
-                        handler->PSendSysMessage(LANG_COMMAND_NO_OUTDOOR_PVP_FORUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_NO_OUTDOOR_PVP_FORUND);
                         return false;
                     }
                     disableTypeStr = "outdoorpvp";
@@ -136,8 +131,7 @@ public:
                 {
                     if (!sMapStore.LookupEntry(entry))
                     {
-                        handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_NOMAPFOUND);
                         return false;
                     }
                     disableTypeStr = "vmap";
@@ -154,8 +148,7 @@ public:
         PreparedQueryResult result = WorldDatabase.Query(stmt);
         if (result)
         {
-            handler->PSendSysMessage("This %s (Id: %u) is already disabled.", disableTypeStr.c_str(), entry);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("This %s (Id: %u) is already disabled.", disableTypeStr.c_str(), entry);
             return false;
         }
 
@@ -242,8 +235,7 @@ public:
         PreparedQueryResult result = WorldDatabase.Query(stmt);
         if (!result)
         {
-            handler->PSendSysMessage("This %s (Id: %u) is not disabled.", disableTypeStr.c_str(), entry);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("This %s (Id: %u) is not disabled.", disableTypeStr.c_str(), entry);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp
index cf7ef2123..c8732b162 100644
--- a/src/server/scripts/Commands/cs_event.cpp
+++ b/src/server/scripts/Commands/cs_event.cpp
@@ -96,16 +96,14 @@ public:
 
         if (std::size_t(eventId) >= events.size())
         {
-            handler->SendSysMessage(LANG_EVENT_NOT_EXIST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_NOT_EXIST);
             return false;
         }
 
         GameEventData const& eventData = events[eventId];
         if (!eventData.isValid())
         {
-            handler->SendSysMessage(LANG_EVENT_NOT_EXIST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_NOT_EXIST);
             return false;
         }
 
@@ -136,24 +134,21 @@ public:
 
         if (*eventId < 1 || *eventId >= events.size())
         {
-            handler->SendSysMessage(LANG_EVENT_NOT_EXIST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_NOT_EXIST);
             return false;
         }
 
         GameEventData const& eventData = events[eventId];
         if (!eventData.isValid())
         {
-            handler->SendSysMessage(LANG_EVENT_NOT_EXIST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_NOT_EXIST);
             return false;
         }
 
         GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList();
         if (activeEvents.find(eventId) != activeEvents.end())
         {
-            handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, uint16(eventId), eventData.description.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_ALREADY_ACTIVE, uint16(eventId), eventData.description.c_str());
             return false;
         }
 
@@ -168,16 +163,14 @@ public:
 
         if (*eventId < 1 || *eventId >= events.size())
         {
-            handler->SendSysMessage(LANG_EVENT_NOT_EXIST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_NOT_EXIST);
             return false;
         }
 
         GameEventData const& eventData = events[eventId];
         if (!eventData.isValid())
         {
-            handler->SendSysMessage(LANG_EVENT_NOT_EXIST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_NOT_EXIST);
             return false;
         }
 
@@ -185,8 +178,7 @@ public:
 
         if (activeEvents.find(eventId) == activeEvents.end())
         {
-            handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE, uint16(eventId), eventData.description.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_EVENT_NOT_ACTIVE, uint16(eventId), eventData.description.c_str());
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index 06fb48581..4816e9969 100644
--- a/src/server/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
@@ -88,8 +88,7 @@ public:
             }
         }
 
-        handler->SendSysMessage(LANG_USE_BOL);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_USE_BOL);
         return false;
     }
 
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index b5e3f7962..0de76e3cb 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -74,8 +74,7 @@ public:
             mapId = player->GetMapId();
         if (!MapMgr::IsValidMapCoord(mapId, pos) || sObjectMgr->IsTransportMap(mapId))
         {
-            handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, pos.GetPositionX(), pos.GetPositionY(), mapId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, pos.GetPositionX(), pos.GetPositionY(), mapId);
             return false;
         }
 
@@ -99,8 +98,7 @@ public:
 
         if (!spawnpoint)
         {
-            handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOCREATNOTFOUND);
             return false;
         }
 
@@ -112,8 +110,7 @@ public:
         CreatureData const* spawnpoint = sObjectMgr->GetCreatureData(spawnId);
         if (!spawnpoint)
         {
-            handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOCREATNOTFOUND);
             return false;
         }
 
@@ -125,8 +122,7 @@ public:
         GameObjectData const* spawnpoint = sObjectMgr->GetGameObjectData(spawnId);
         if (!spawnpoint)
         {
-            handler->SendSysMessage(LANG_COMMAND_GOOBJNOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOOBJNOTFOUND);
             return false;
         }
 
@@ -139,8 +135,7 @@ public:
 
         if (!spawnpoint)
         {
-            handler->SendSysMessage(LANG_COMMAND_GOOBJNOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOOBJNOTFOUND);
             return false;
         }
 
@@ -152,15 +147,13 @@ public:
         GraveyardStruct const* gy = sGraveyard->GetGraveyard(gyId);
         if (!gy)
         {
-            handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, gyId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GRAVEYARDNOEXIST, gyId);
             return false;
         }
 
         if (!MapMgr::IsValidMapCoord(gy->Map, gy->x, gy->y, gy->z))
         {
-            handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, gy->x, gy->y, gy->Map);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, gy->x, gy->y, gy->Map);
             return false;
         }
 
@@ -191,8 +184,7 @@ public:
 
         if (!MapMgr::IsValidMapCoord(mapId, x, y))
         {
-            handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
             return false;
         }
 
@@ -218,8 +210,7 @@ public:
         TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(nodeId);
         if (!node)
         {
-            handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND, uint32(nodeId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOTAXINODENOTFOUND, uint32(nodeId));
             return false;
         }
         return DoTeleport(handler, { node->x, node->y, node->z }, node->map_id);
@@ -230,8 +221,7 @@ public:
         AreaTrigger const* at = sObjectMgr->GetAreaTrigger(areaTriggerId);
         if (!at)
         {
-            handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND, uint32(areaTriggerId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOAREATRNOTFOUND, uint32(areaTriggerId));
             return false;
         }
         return DoTeleport(handler, { at->x, at->y, at->z }, at->map);
@@ -248,8 +238,7 @@ public:
 
         if (x < 0 || x > 100 || y < 0 || y > 100 || !areaEntry)
         {
-            handler->PSendSysMessage(LANG_INVALID_ZONE_COORD, x, y, areaId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_ZONE_COORD, x, y, areaId);
             return false;
         }
 
@@ -261,8 +250,7 @@ public:
 
         if (map->Instanceable())
         {
-            handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name[handler->GetSessionDbcLocale()], map->GetId(), map->GetMapName());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name[handler->GetSessionDbcLocale()], map->GetId(), map->GetMapName());
             return false;
         }
 
@@ -270,8 +258,7 @@ public:
 
         if (!MapMgr::IsValidMapCoord(zoneEntry->mapid, x, y))
         {
-            handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->mapid);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->mapid);
             return false;
         }
 
@@ -343,8 +330,7 @@ public:
 
         if (mapId == MAPID_INVALID)
         {
-            handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
             return false;
         }
 
@@ -356,8 +342,7 @@ public:
 
         if (!MapMgr::IsValidMapCoord(mapId, x, y, z, o))
         {
-            handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
             return false;
         }
 
@@ -404,8 +389,7 @@ public:
                     CreatureData const* spawnpoint = GetCreatureData(handler, itr->first);
                     if (!spawnpoint)
                     {
-                        handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_GOCREATNOTFOUND);
                         return false;
                     }
 
@@ -423,8 +407,7 @@ public:
                     GameObjectData const* spawnpoint = GetGameObjectData(handler, itr->first);
                     if (!spawnpoint)
                     {
-                        handler->SendSysMessage(LANG_COMMAND_GOOBJNOTFOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_GOOBJNOTFOUND);
                         return false;
                     }
 
@@ -443,8 +426,7 @@ public:
                     CreatureData const* spawnpoint = GetCreatureData(handler, itr->first);
                     if (!spawnpoint)
                     {
-                        handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_GOCREATNOTFOUND);
                         return false;
                     }
 
@@ -462,8 +444,7 @@ public:
                     GameObjectData const* spawnpoint = GetGameObjectData(handler, itr->first);
                     if (!spawnpoint)
                     {
-                        handler->SendSysMessage(LANG_COMMAND_GOOBJNOTFOUND);
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_COMMAND_GOOBJNOTFOUND);
                         return false;
                     }
 
@@ -473,8 +454,7 @@ public:
         }
         else
         {
-            handler->SendSysMessage(LANG_CMD_GOQUEST_INVALID_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_GOQUEST_INVALID_SYNTAX);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 888409772..40babbc68 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -73,8 +73,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
             return false;
         }
 
@@ -98,8 +97,7 @@ public:
         GameObjectTemplate const* objectInfo = sObjectMgr->GetGameObjectTemplate(objectId);
         if (!objectInfo)
         {
-            handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, uint32(objectId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_GAMEOBJECT_NOT_EXIST, uint32(objectId));
             return false;
         }
 
@@ -107,8 +105,7 @@ public:
         {
             // report to DB errors log as in loading case
             LOG_ERROR("sql.sql", "Gameobject (Entry {} GoType: {}) have invalid displayId ({}), not spawned.", *objectId, objectInfo->type, objectInfo->displayId);
-            handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, uint32(objectId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, uint32(objectId));
             return false;
         }
 
@@ -162,8 +159,7 @@ public:
 
         if (!sObjectMgr->GetGameObjectTemplate(objectId))
         {
-            handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, uint32(objectId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_GAMEOBJECT_NOT_EXIST, uint32(objectId));
             return false;
         }
 
@@ -299,8 +295,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(spawnId);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, uint32(spawnId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, uint32(spawnId));
             return false;
         }
 
@@ -310,8 +305,7 @@ public:
             Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(), ownerGuid);
             if (!owner || !ownerGuid.IsPlayer())
             {
-                handler->PSendSysMessage(LANG_COMMAND_DELOBJREFERCREATURE, ownerGuid.GetCounter(), object->GetSpawnId());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_DELOBJREFERCREATURE, ownerGuid.GetCounter(), object->GetSpawnId());
                 return false;
             }
 
@@ -336,8 +330,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
             return false;
         }
 
@@ -375,8 +368,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
             return false;
         }
 
@@ -386,8 +378,7 @@ public:
             pos = { (*xyz)[0], (*xyz)[1], (*xyz)[2] };
             if (!MapMgr::IsValidMapCoord(object->GetMapId(), pos))
             {
-                handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, pos.GetPositionX(), pos.GetPositionY(), object->GetMapId());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, pos.GetPositionX(), pos.GetPositionY(), object->GetMapId());
                 return false;
             }
         }
@@ -432,15 +423,13 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
             return false;
         }
 
         if (!phaseMask)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -512,8 +501,7 @@ public:
             GameObjectData const* spawnData = sObjectMgr->GetGameObjectData(spawnId);
             if (!spawnData)
             {
-                handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, spawnId);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, spawnId);
                 return false;
             }
             entry = spawnData->id;
@@ -527,8 +515,7 @@ public:
         GameObjectTemplate const* gameObjectInfo = sObjectMgr->GetGameObjectTemplate(entry);
         if (!gameObjectInfo)
         {
-            handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, entry);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_GAMEOBJECT_NOT_EXIST, entry);
             return false;
         }
 
@@ -569,8 +556,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp
index 91d0f73fa..ea2404cb4 100644
--- a/src/server/scripts/Commands/cs_guild.cpp
+++ b/src/server/scripts/Commands/cs_guild.cpp
@@ -62,8 +62,7 @@ public:
 
         if (!target || !target->IsConnected())
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -76,22 +75,19 @@ public:
 
         if (playerTarget->GetGuildId())
         {
-            handler->SendSysMessage(LANG_PLAYER_IN_GUILD);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_IN_GUILD);
             return false;
         }
 
         if (sGuildMgr->GetGuildByName(guildName))
         {
-            handler->SendSysMessage(LANG_GUILD_RENAME_ALREADY_EXISTS);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_GUILD_RENAME_ALREADY_EXISTS);
             return false;
         }
 
         if (sObjectMgr->IsReservedName(guildName) || sObjectMgr->IsProfanityName(guildName) || !sObjectMgr->IsValidCharterName(guildName))
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -99,8 +95,7 @@ public:
         if (!guild->Create(playerTarget, guildName))
         {
             delete guild;
-            handler->SendSysMessage(LANG_GUILD_NOT_CREATED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_GUILD_NOT_CREATED);
             return false;
         }
 
@@ -206,22 +201,19 @@ public:
         Guild* guild = sGuildMgr->GetGuildByName(oldGuildStr);
         if (!guild)
         {
-            handler->PSendSysMessage(LANG_COMMAND_COULDNOTFIND, oldGuildStr);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_COULDNOTFIND, oldGuildStr);
             return false;
         }
 
         if (sGuildMgr->GetGuildByName(newGuildStr))
         {
-            handler->PSendSysMessage(LANG_GUILD_RENAME_ALREADY_EXISTS, newGuildStr);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_GUILD_RENAME_ALREADY_EXISTS, newGuildStr);
             return false;
         }
 
         if (!guild->SetName(newGuildStr))
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp
index 52eac618c..46794c94e 100644
--- a/src/server/scripts/Commands/cs_honor.cpp
+++ b/src/server/scripts/Commands/cs_honor.cpp
@@ -61,8 +61,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -79,8 +78,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -98,8 +96,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
index d9170ad6c..00d2630bc 100644
--- a/src/server/scripts/Commands/cs_instance.cpp
+++ b/src/server/scripts/Commands/cs_instance.cpp
@@ -139,9 +139,7 @@ public:
         arena = 0;
         spectators = 0;
         sMapMgr->GetNumPlayersInInstances(dungeon, battleground, arena, spectators);
-        handler->PSendSysMessage("players in instances: dungeons (%d), battlegrounds (%d), arenas (%d + %d spect)", dungeon, battleground, arena, spectators);
-
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage("players in instances: dungeons (%d), battlegrounds (%d), arenas (%d + %d spect)", dungeon, battleground, arena, spectators);
         return false;
     }
 
@@ -151,15 +149,13 @@ public:
         Map* map = player->GetMap();
         if (!map->IsDungeon())
         {
-            handler->PSendSysMessage("Map is not a dungeon.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Map is not a dungeon.");
             return false;
         }
 
         if (!map->ToInstanceMap()->GetInstanceScript())
         {
-            handler->PSendSysMessage("Map has no instance data.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Map has no instance data.");
             return false;
         }
 
@@ -173,8 +169,7 @@ public:
         // Character name must be provided when using this from console.
         if (!player && !handler->GetSession())
         {
-            handler->PSendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -183,31 +178,27 @@ public:
 
         if (!player->IsConnected())
         {
-            handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
         InstanceMap* map = player->GetConnectedPlayer()->GetMap()->ToInstanceMap();
         if (!map)
         {
-            handler->PSendSysMessage(LANG_NOT_DUNGEON);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NOT_DUNGEON);
             return false;
         }
 
         if (!map->GetInstanceScript())
         {
-            handler->PSendSysMessage(LANG_NO_INSTANCE_DATA);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_INSTANCE_DATA);
             return false;
         }
 
         // Reject improper values.
         if (encounterId > map->GetInstanceScript()->GetEncounterCount())
         {
-            handler->PSendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -222,8 +213,7 @@ public:
         // Character name must be provided when using this from console.
         if (!player && !handler->GetSession())
         {
-            handler->PSendSysMessage(LANG_CMD_SYNTAX);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_SYNTAX);
             return false;
         }
 
@@ -232,30 +222,26 @@ public:
 
         if (!player->IsConnected())
         {
-            handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
         InstanceMap* map = player->GetConnectedPlayer()->GetMap()->ToInstanceMap();
         if (!map)
         {
-            handler->PSendSysMessage(LANG_NOT_DUNGEON);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NOT_DUNGEON);
             return false;
         }
 
         if (!map->GetInstanceScript())
         {
-            handler->PSendSysMessage(LANG_NO_INSTANCE_DATA);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_INSTANCE_DATA);
             return false;
         }
 
         if (encounterId > map->GetInstanceScript()->GetEncounterCount())
         {
-            handler->PSendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_inventory.cpp b/src/server/scripts/Commands/cs_inventory.cpp
index 649fe310c..dcf873d98 100644
--- a/src/server/scripts/Commands/cs_inventory.cpp
+++ b/src/server/scripts/Commands/cs_inventory.cpp
@@ -91,16 +91,14 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
         Player* target = player->GetConnectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_item.cpp b/src/server/scripts/Commands/cs_item.cpp
index 0fad10d33..dff751758 100644
--- a/src/server/scripts/Commands/cs_item.cpp
+++ b/src/server/scripts/Commands/cs_item.cpp
@@ -66,8 +66,7 @@ public:
 
         if (!HasItemDeletionConfig())
         {
-            handler->SendSysMessage(LANG_COMMAND_DISABLED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_DISABLED);
             return false;
         }
 
@@ -78,8 +77,7 @@ public:
 
         if (!fields || !(*fields)[1].Get<uint32>() || (*fields)[3].Get<uint32>() != player.GetGUID().GetCounter())
         {
-            handler->SendSysMessage(LANG_ITEM_RESTORE_MISSING);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ITEM_RESTORE_MISSING);
             return false;
         }
 
@@ -124,8 +122,7 @@ public:
     {
         if (!HasItemDeletionConfig())
         {
-            handler->SendSysMessage(LANG_COMMAND_DISABLED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_DISABLED);
             return false;
         }
 
@@ -135,8 +132,7 @@ public:
 
         if (!disposedItems)
         {
-            handler->SendSysMessage(LANG_ITEM_RESTORE_LIST_EMPTY);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ITEM_RESTORE_LIST_EMPTY);
             return false;
         }
 
@@ -189,8 +185,7 @@ public:
         ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCost);
         if (!iece)
         {
-            handler->PSendSysMessage(LANG_CMD_ITEM_REFUND_BAD_EXTENDED_COST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CMD_ITEM_REFUND_BAD_EXTENDED_COST);
             return false;
         }
 
@@ -198,8 +193,7 @@ public:
 
         if (!item)
         {
-            handler->PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, itemId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_ITEMIDINVALID, itemId);
             return false;
         }
 
@@ -207,8 +201,7 @@ public:
         {
             if (!target->HasItemCount(itemId, 1, true))
             {
-                handler->PSendSysMessage(LANG_CMD_ITEM_REFUND_NOT_FOUND, itemId);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_CMD_ITEM_REFUND_NOT_FOUND, itemId);
                 return false;
             }
 
@@ -217,9 +210,8 @@ public:
                 uint32 honor = target->GetHonorPoints() + iece->reqhonorpoints;
                 if (honor > sWorld->getIntConfig(CONFIG_MAX_HONOR_POINTS))
                 {
-                    handler->PSendSysMessage(LANG_CMD_ITEM_REFUND_MAX_HONOR, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_HONOR_POINTS), target->GetHonorPoints(), iece->reqhonorpoints);
+                    handler->SendErrorMessage(LANG_CMD_ITEM_REFUND_MAX_HONOR, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_HONOR_POINTS), target->GetHonorPoints(), iece->reqhonorpoints);
                     ChatHandler(target->GetSession()).PSendSysMessage(LANG_CMD_ITEM_REFUND_HONOR_FAILED, item->Name1);
-                    handler->SetSentErrorMessage(true);
                     return false;
                 }
 
@@ -233,9 +225,8 @@ public:
                 uint32 arenapoints = target->GetArenaPoints() + iece->reqarenapoints;
                 if (arenapoints > sWorld->getIntConfig(CONFIG_MAX_ARENA_POINTS))
                 {
-                    handler->PSendSysMessage(LANG_CMD_ITEM_REFUND_MAX_AP, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_ARENA_POINTS), target->GetArenaPoints(), iece->reqarenapoints);
+                    handler->SendErrorMessage(LANG_CMD_ITEM_REFUND_MAX_AP, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_ARENA_POINTS), target->GetArenaPoints(), iece->reqarenapoints);
                     ChatHandler(target->GetSession()).PSendSysMessage(LANG_CMD_ITEM_REFUND_AP_FAILED, item->Name1);
-                    handler->SetSentErrorMessage(true);
                     return false;
                 }
 
@@ -284,8 +275,7 @@ public:
                         Field* fields = queryResult->Fetch();
                         if ((fields[0].Get<uint32>() + iece->reqhonorpoints) > sWorld->getIntConfig(CONFIG_MAX_HONOR_POINTS))
                         {
-                            handler->PSendSysMessage(LANG_CMD_ITEM_REFUND_MAX_HONOR, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_HONOR_POINTS), fields[0].Get<uint32>(), iece->reqhonorpoints);
-                            handler->SetSentErrorMessage(true);
+                            handler->SendErrorMessage(LANG_CMD_ITEM_REFUND_MAX_HONOR, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_HONOR_POINTS), fields[0].Get<uint32>(), iece->reqhonorpoints);
                             return false;
                         }
                     }
@@ -309,8 +299,7 @@ public:
                         Field* fields = queryResult->Fetch();
                         if ((fields[0].Get<uint32>() + iece->reqhonorpoints) > sWorld->getIntConfig(CONFIG_MAX_ARENA_POINTS))
                         {
-                            handler->PSendSysMessage(LANG_CMD_ITEM_REFUND_MAX_AP, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_ARENA_POINTS), fields[0].Get<uint32>(), iece->reqarenapoints);
-                            handler->SetSentErrorMessage(true);
+                            handler->SendErrorMessage(LANG_CMD_ITEM_REFUND_MAX_AP, item->Name1, item->ItemId, sWorld->getIntConfig(CONFIG_MAX_ARENA_POINTS), fields[0].Get<uint32>(), iece->reqarenapoints);
                             return false;
                         }
                     }
@@ -369,8 +358,7 @@ public:
             }
             else
             {
-                handler->PSendSysMessage(LANG_CMD_ITEM_REFUND_NOT_FOUND, itemId);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_CMD_ITEM_REFUND_NOT_FOUND, itemId);
                 return false;
             }
         }
diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
index 267eaaa2f..51f2bcdc9 100644
--- a/src/server/scripts/Commands/cs_learn.cpp
+++ b/src/server/scripts/Commands/cs_learn.cpp
@@ -78,8 +78,7 @@ public:
 
         if (!targetPlayer)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -212,31 +211,27 @@ public:
         Pet* pet = player->GetPet();
         if (!pet)
         {
-            handler->SendSysMessage(LANG_NO_PET_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_PET_FOUND);
             return false;
         }
 
         CreatureTemplate const* creatureInfo = pet->GetCreatureTemplate();
         if (!creatureInfo)
         {
-            handler->SendSysMessage(LANG_WRONG_PET_TYPE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_WRONG_PET_TYPE);
             return false;
         }
 
         CreatureFamilyEntry const* petFamily = sCreatureFamilyStore.LookupEntry(creatureInfo->family);
         if (!petFamily)
         {
-            handler->SendSysMessage(LANG_WRONG_PET_TYPE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_WRONG_PET_TYPE);
             return false;
         }
 
         if (petFamily->petTalentType < 0)                       // not hunter pet
         {
-            handler->SendSysMessage(LANG_WRONG_PET_TYPE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_WRONG_PET_TYPE);
             return false;
         }
 
@@ -430,8 +425,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp
index 6a64ba68f..5ee7c51e3 100644
--- a/src/server/scripts/Commands/cs_list.cpp
+++ b/src/server/scripts/Commands/cs_list.cpp
@@ -71,8 +71,7 @@ public:
         CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(creatureId);
         if (!cInfo)
         {
-            handler->PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, uint32(creatureId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_INVALIDCREATUREID, uint32(creatureId));
             return false;
         }
 
@@ -343,8 +342,7 @@ public:
 
         if (inventoryCount + mailCount + auctionCount + guildCount == 0)
         {
-            handler->SendSysMessage(LANG_COMMAND_NOITEMFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NOITEMFOUND);
             return false;
         }
 
@@ -358,8 +356,7 @@ public:
         GameObjectTemplate const* gInfo = sObjectMgr->GetGameObjectTemplate(gameObjectId);
         if (!gInfo)
         {
-            handler->PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, uint32(gameObjectId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_LISTOBJINVALIDID, uint32(gameObjectId));
             return false;
         }
 
@@ -459,8 +456,7 @@ public:
         Unit* unit = handler->getSelectedUnit();
         if (!unit)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index d4f2ce45b..49b8e0501 100644
--- a/src/server/scripts/Commands/cs_lookup.cpp
+++ b/src/server/scripts/Commands/cs_lookup.cpp
@@ -1172,8 +1172,7 @@ public:
 
         if (!SpellMgr::IsSpellValid(spell))
         {
-            handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
             return false;
         }
 
@@ -1650,8 +1649,7 @@ public:
     {
         if (!result)
         {
-            handler->PSendSysMessage(LANG_NO_PLAYERS_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_PLAYERS_FOUND);
             return false;
         }
 
@@ -1710,8 +1708,7 @@ public:
 
         if (!counter) // empty accounts only
         {
-            handler->PSendSysMessage(LANG_NO_PLAYERS_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_PLAYERS_FOUND);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp
index 0ea24d552..1e387f3e3 100644
--- a/src/server/scripts/Commands/cs_message.cpp
+++ b/src/server/scripts/Commands/cs_message.cpp
@@ -175,14 +175,12 @@ public:
                 }
                 else
                 {
-                    handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND, playerNameArg->c_str());
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND, playerNameArg->c_str());
                     return false;
                 }
             }
         }
-        handler->SendSysMessage(LANG_USE_BOL);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_USE_BOL);
         return false;
     }
 };
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 7534cccf2..bd33d075d 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -169,8 +169,7 @@ public:
             {
                 if (arenaTokens.size() > 1)
                 {
-                    handler->PSendSysMessage("Invalid [arena] specified.");
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage("Invalid [arena] specified.");
                     return false;
                 }
 
@@ -202,8 +201,7 @@ public:
             }
             else
             {
-                handler->PSendSysMessage("Invalid [arena] specified.");
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage("Invalid [arena] specified.");
                 return false;
             }
         }
@@ -236,15 +234,13 @@ public:
 
         if (!count)
         {
-            handler->PSendSysMessage("Invalid bracket. Can be 1v1, 2v2, 3v3, 5v5");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Invalid bracket. Can be 1v1, 2v2, 3v3, 5v5");
             return false;
         }
 
         if (tokens.size() != uint16(count + 2))
         {
-            handler->PSendSysMessage("Invalid number of nicknames for this bracket.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Invalid number of nicknames for this bracket.");
             return false;
         }
 
@@ -409,16 +405,14 @@ public:
         Battleground* bgt = sBattlegroundMgr->GetBattlegroundTemplate(BATTLEGROUND_AA);
         if (!bgt)
         {
-            handler->PSendSysMessage("Couldn't create arena map!");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Couldn't create arena map!");
             return false;
         }
 
         Battleground* bg = sBattlegroundMgr->CreateNewBattleground(randomizedArenaBgTypeId, GetBattlegroundBracketById(bgt->GetMapId(), bgt->GetBracketId()), ArenaType(hcnt >= 2 ? hcnt : 2), false);
         if (!bg)
         {
-            handler->PSendSysMessage("Couldn't create arena map!");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Couldn't create arena map!");
             return false;
         }
 
@@ -492,8 +486,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_USE_BOL);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_USE_BOL);
         return false;
     }
 
@@ -538,8 +531,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_USE_BOL);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_USE_BOL);
         return false;
     }
 
@@ -638,23 +630,20 @@ public:
     {
         if (!spell)
         {
-            handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NOSPELLFOUND);
             return false;
         }
 
         if (!SpellMgr::IsSpellValid(spell))
         {
-            handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
             return false;
         }
 
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -668,8 +657,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -681,8 +669,7 @@ public:
 
         if (!spells.holds_alternative<SpellInfo const*>())
         {
-            handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NOSPELLFOUND);
             return false;
         }
 
@@ -690,8 +677,7 @@ public:
 
         if (!SpellMgr::IsSpellValid(spell))
         {
-            handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
             return false;
         }
 
@@ -715,8 +701,7 @@ public:
         Player* _player = handler->GetSession()->GetPlayer();
         if (target->GetGUID() == _player->GetGUID())
         {
-            handler->SendSysMessage(LANG_CANT_TELEPORT_SELF);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CANT_TELEPORT_SELF);
             return false;
         }
 
@@ -738,8 +723,7 @@ public:
                 // only allow if gm mode is on
                 if (!_player->IsGameMaster())
                 {
-                    handler->PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM, nameLink.c_str());
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_CANNOT_GO_TO_BG_GM, nameLink.c_str());
                     return false;
                 }
 
@@ -760,8 +744,7 @@ public:
                     // we are in group, we can go only if we are in the player group
                     if (_player->GetGroup() != targetPlayer->GetGroup())
                     {
-                        handler->PSendSysMessage(LANG_CANNOT_GO_TO_INST_PARTY, nameLink.c_str());
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_CANNOT_GO_TO_INST_PARTY, nameLink.c_str());
                         return false;
                     }
                 }
@@ -770,8 +753,7 @@ public:
                     // we are not in group, let's verify our GM mode
                     if (!_player->IsGameMaster())
                     {
-                        handler->PSendSysMessage(LANG_CANNOT_GO_TO_INST_GM, nameLink.c_str());
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage(LANG_CANNOT_GO_TO_INST_GM, nameLink.c_str());
                         return false;
                     }
                 }
@@ -868,8 +850,7 @@ public:
         Player* _player = handler->GetSession()->GetPlayer();
         if (target->GetGUID() == _player->GetGUID())
         {
-            handler->PSendSysMessage(LANG_CANT_TELEPORT_SELF);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CANT_TELEPORT_SELF);
             return false;
         }
 
@@ -887,8 +868,7 @@ public:
 
             if (targetPlayer->IsBeingTeleported())
             {
-                handler->PSendSysMessage(LANG_IS_TELEPORTED, nameLink.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_IS_TELEPORTED, nameLink.c_str());
                 return false;
             }
 
@@ -896,8 +876,7 @@ public:
 
             if (map->IsBattlegroundOrArena())
             {
-                handler->PSendSysMessage("Can't summon to a battleground!");
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage("Can't summon to a battleground!");
                 return false;
             }
             else if (map->IsDungeon())
@@ -908,8 +887,7 @@ public:
                     // pussywizard: prevent unbinding normal player's perm bind by just summoning him >_>
                     if (!targetPlayer->GetSession()->GetSecurity())
                     {
-                        handler->PSendSysMessage("Only GMs can be summoned to an instance!");
-                        handler->SetSentErrorMessage(true);
+                        handler->SendErrorMessage("Only GMs can be summoned to an instance!");
                         return false;
                     }
                 }
@@ -927,8 +905,7 @@ public:
                         (handler->GetSession()->GetPlayer()->GetGroup()->GetLeaderGUID() != handler->GetSession()->GetPlayer()->GetGUID()))
                     // the last check is a bit excessive, but let it be, just in case
                 {
-                    handler->PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST, nameLink.c_str());
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_CANNOT_SUMMON_TO_INST, nameLink.c_str());
                     return false;
                 }
             }
@@ -1006,8 +983,7 @@ public:
 
         if (!group)
         {
-            handler->PSendSysMessage(LANG_NOT_IN_GROUP, nameLink.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NOT_IN_GROUP, nameLink.c_str());
             return false;
         }
 
@@ -1020,8 +996,7 @@ public:
                     (handler->GetSession()->GetPlayer()->GetGroup()->GetLeaderGUID() != handler->GetSession()->GetPlayer()->GetGUID())))
             // the last check is a bit excessive, but let it be, just in case
         {
-            handler->SendSysMessage(LANG_CANNOT_SUMMON_TO_INST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CANNOT_SUMMON_TO_INST);
             return false;
         }
 
@@ -1044,8 +1019,7 @@ public:
 
             if (player->IsBeingTeleported())
             {
-                handler->PSendSysMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
                 return false;
             }
 
@@ -1056,8 +1030,7 @@ public:
                 if (playerMap->Instanceable() && playerMap->GetInstanceId() != gmMap->GetInstanceId())
                 {
                     // cannot summon from instance to instance
-                    handler->PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST, plNameLink.c_str());
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_CANNOT_SUMMON_TO_INST, plNameLink.c_str());
                     return false;
                 }
             }
@@ -1101,8 +1074,7 @@ public:
 
         if (!target || !handler->GetSession()->GetPlayer()->GetTarget())
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -1169,15 +1141,13 @@ public:
         // If player is not mounted, so go out :)
         if (!player->IsMounted())
         {
-            handler->SendSysMessage(LANG_CHAR_NON_MOUNTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CHAR_NON_MOUNTED);
             return false;
         }
 
         if (player->IsInFlight())
         {
-            handler->SendSysMessage(LANG_YOU_IN_FLIGHT);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_YOU_IN_FLIGHT);
             return false;
         }
 
@@ -1194,8 +1164,7 @@ public:
 
         if (!guid)
         {
-            handler->SendSysMessage(LANG_NO_SELECTION);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_SELECTION);
             return false;
         }
 
@@ -1220,8 +1189,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -1236,8 +1204,7 @@ public:
         {
             if (!SpellMgr::IsSpellValid(*spell))
             {
-                handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell.value()->Id);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell.value()->Id);
                 return false;
             }
 
@@ -1297,8 +1264,7 @@ public:
 
         if (targetPlayer->IsBeingTeleported())
         {
-            handler->PSendSysMessage(LANG_IS_TELEPORTED, handler->playerLink(target->GetName()).c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_IS_TELEPORTED, handler->playerLink(target->GetName()).c_str());
             return false;
         }
 
@@ -1368,8 +1334,7 @@ public:
 
         if (handler->GetSession() && target->GetGUID() == handler->GetSession()->GetPlayer()->GetGUID())
         {
-            handler->SendSysMessage(LANG_COMMAND_KICKSELF);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_KICKSELF);
             return false;
         }
 
@@ -1487,8 +1452,7 @@ public:
 
         if (!graveyard)
         {
-            handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, graveyardId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GRAVEYARDNOEXIST, graveyardId);
             return false;
         }
 
@@ -1498,8 +1462,7 @@ public:
         AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(zoneId);
         if (!areaEntry || areaEntry->zone != 0)
         {
-            handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, graveyardId, zoneId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, graveyardId, zoneId);
             return false;
         }
 
@@ -1548,8 +1511,7 @@ public:
             GraveyardData const* data = sGraveyard->FindGraveyardData(graveyardId, zone_id);
             if (!data)
             {
-                handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDERROR, graveyardId);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_GRAVEYARDERROR, graveyardId);
                 return false;
             }
 
@@ -1598,24 +1560,21 @@ public:
         Player* playerTarget = handler->getSelectedPlayer();
         if (!playerTarget)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
         AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaID);
         if (!area)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         int32 offset = area->exploreFlag / 32;
         if (offset >= PLAYER_EXPLORED_ZONES_SIZE)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -1632,24 +1591,21 @@ public:
         Player* playerTarget = handler->getSelectedPlayer();
         if (!playerTarget)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
         AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaID);
         if (!area)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         int32 offset = area->exploreFlag / 32;
         if (offset >= PLAYER_EXPLORED_ZONES_SIZE)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -1665,8 +1621,7 @@ public:
     {
         if (!sObjectMgr->GetItemTemplate(itemTemplate->ItemId))
         {
-            handler->PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, itemTemplate->ItemId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_ITEMIDINVALID, itemTemplate->ItemId);
             return false;
         }
 
@@ -1700,16 +1655,14 @@ public:
                 if (!playerTarget->HasItemCount(itemId, 0))
                 {
                     // output that player don't have any items to destroy
-                    handler->PSendSysMessage(LANG_REMOVEITEM_FAILURE, handler->GetNameLink(playerTarget).c_str(), itemId);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_REMOVEITEM_FAILURE, handler->GetNameLink(playerTarget).c_str(), itemId);
                     return false;
                 }
 
                 if (!playerTarget->HasItemCount(itemId, -count))
                 {
                     // output that player don't have as many items that you want to destroy
-                    handler->PSendSysMessage(LANG_REMOVEITEM_ERROR, handler->GetNameLink(playerTarget).c_str(), itemId);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_REMOVEITEM_ERROR, handler->GetNameLink(playerTarget).c_str(), itemId);
                     return false;
                 }
             }
@@ -1734,8 +1687,7 @@ public:
 
         if (!count || dest.empty()) // can't add any
         {
-            handler->PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount);
             return false;
         }
 
@@ -1776,8 +1728,7 @@ public:
         // prevent generation all items with itemset field value '0'
         if (!*itemSetId)
         {
-            handler->PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, uint32(itemSetId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, uint32(itemSetId));
             return false;
         }
 
@@ -1826,8 +1777,7 @@ public:
 
         if (!found)
         {
-            handler->PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, uint32(itemSetId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, uint32(itemSetId));
             return false;
         }
 
@@ -1839,8 +1789,7 @@ public:
         // Weather is OFF
         if (!sWorld->getBoolConfig(CONFIG_WEATHER))
         {
-            handler->SendSysMessage(LANG_WEATHER_DISABLED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_WEATHER_DISABLED);
             return false;
         }
 
@@ -1856,8 +1805,7 @@ public:
 
         if (!weather)
         {
-            handler->SendSysMessage(LANG_NO_WEATHER);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_WEATHER);
             return false;
         }
 
@@ -1871,8 +1819,7 @@ public:
         Player* SelectedPlayer = handler->getSelectedPlayer();
         if (!SelectedPlayer)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -1887,24 +1834,21 @@ public:
 
         if (skillID <= 0)
         {
-            handler->PSendSysMessage(LANG_INVALID_SKILL_ID, skillID);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_SKILL_ID, skillID);
             return false;
         }
 
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
         SkillLineEntry const* skillLine = sSkillLineStore.LookupEntry(skillID);
         if (!skillLine)
         {
-            handler->PSendSysMessage(LANG_INVALID_SKILL_ID, uint32(skillID));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_SKILL_ID, uint32(skillID));
             return false;
         }
 
@@ -2384,8 +2328,7 @@ public:
         {
             if (target->GetTypeId() != TYPEID_UNIT || target->IsPet())
             {
-                handler->SendSysMessage(LANG_SELECT_CREATURE);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_SELECT_CREATURE);
                 return false;
             }
 
@@ -2396,8 +2339,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_SELECT_CREATURE);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_SELECT_CREATURE);
         return false;
     }
 
@@ -2428,8 +2370,7 @@ public:
 
         if (Acore::StringTo<int32>(notSpeakTime).value_or(0) < 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -2445,8 +2386,7 @@ public:
 
         if (!player)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -2475,8 +2415,7 @@ public:
 
         if (muteDuration <= 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -2578,8 +2517,7 @@ public:
         {
             if (playerTarget->CanSpeak())
             {
-                handler->SendSysMessage(LANG_CHAT_ALREADY_ENABLED);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_CHAT_ALREADY_ENABLED);
                 return false;
             }
 
@@ -2608,8 +2546,7 @@ public:
     {
         if (!Utf8ToUpperOnlyLatin(accountName))
         {
-            handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
             return false;
         }
 
@@ -2651,8 +2588,7 @@ public:
         Unit* unit = handler->getSelectedUnit();
         if (!unit)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -2786,8 +2722,7 @@ public:
         Creature* caster = handler->getSelectedCreature();
         if (!caster)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -2803,8 +2738,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target || !handler->GetSession()->GetPlayer()->GetTarget())
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -2850,8 +2784,7 @@ public:
 
         if (!target || !target->IsConnected())
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -2885,8 +2818,7 @@ public:
 
         if (!target && !creatureTarget)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -2914,8 +2846,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
         return false;
     }
 
@@ -2930,8 +2861,7 @@ public:
 
         if (!target && !creatureTarget)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -2966,8 +2896,7 @@ public:
     {
         if (!sSoundEntriesStore.LookupEntry(soundId))
         {
-            handler->PSendSysMessage(LANG_SOUND_NOT_EXIST, soundId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SOUND_NOT_EXIST, soundId);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index 9ab6bcb6e..abefda321 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -108,15 +108,13 @@ public:
     {
         if (modifyValue < 1)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -257,8 +255,7 @@ public:
         Creature* target = handler->getSelectedCreature();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -297,8 +294,7 @@ public:
 
         if (!sFactionTemplateStore.LookupEntry(factionid))
         {
-            handler->PSendSysMessage(LANG_WRONG_FACTION, factionid);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_WRONG_FACTION, factionid);
             return false;
         }
 
@@ -318,8 +314,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -356,8 +351,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -387,8 +381,7 @@ public:
             }
         }
 
-        handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
         return false;
     }
 
@@ -396,15 +389,13 @@ public:
     {
         if (speed > maximumBound || speed < minimumBound)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -418,8 +409,7 @@ public:
 
             if (player->IsInFlight() && checkInFlight)
             {
-                handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, handler->GetNameLink(player).c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_CHAR_IN_FLIGHT, handler->GetNameLink(player).c_str());
                 return false;
             }
         }
@@ -505,16 +495,14 @@ public:
     {
         if (scale > 10.0f || scale < 0.1f)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
             return false;
         }
 
@@ -539,16 +527,14 @@ public:
     {
         if (!sCreatureDisplayInfoStore.LookupEntry(creatureDisplayID))
         {
-            handler->SendSysMessage(LANG_NO_MOUNT);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_MOUNT);
             return false;
         }
 
         Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -584,8 +570,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -676,8 +661,7 @@ public:
         Unit* target = handler->getSelectedUnit();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -689,15 +673,13 @@ public:
 
         if (field < OBJECT_END || field >= target->GetValuesCount())
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         if (bit < 1 || bit > 32)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -720,8 +702,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -758,8 +739,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -804,8 +784,7 @@ public:
                     {
                         if (*delta < 0 || (*delta > ReputationMgr::PointsInRank[r] - 1))
                         {
-                            handler->PSendSysMessage(LANG_COMMAND_FACTION_DELTA, ReputationMgr::PointsInRank[r] - 1);
-                            handler->SetSentErrorMessage(true);
+                            handler->SendErrorMessage(LANG_COMMAND_FACTION_DELTA, ReputationMgr::PointsInRank[r] - 1);
                             return false;
                         }
 
@@ -820,8 +799,7 @@ public:
 
             if (r >= MAX_REPUTATION_RANK)
             {
-                handler->PSendSysMessage(LANG_COMMAND_FACTION_INVPARAM, rankStr.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_FACTION_INVPARAM, rankStr.c_str());
                 return false;
             }
         }
@@ -839,15 +817,13 @@ public:
 
         if (!factionEntry)
         {
-            handler->PSendSysMessage(LANG_COMMAND_FACTION_UNKNOWN, factionId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_FACTION_UNKNOWN, factionId);
             return false;
         }
 
         if (factionEntry->reputationListID < 0)
         {
-            handler->PSendSysMessage(LANG_COMMAND_FACTION_NOREP_ERROR, factionEntry->name[handler->GetSessionDbcLocale()], factionId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_FACTION_NOREP_ERROR, factionEntry->name[handler->GetSessionDbcLocale()], factionId);
             return false;
         }
 
@@ -922,8 +898,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -944,8 +919,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -973,8 +947,7 @@ public:
         }
         else
         {
-            handler->SendSysMessage(LANG_MUST_MALE_OR_FEMALE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_MUST_MALE_OR_FEMALE);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 94ad998c6..eca1ccdc7 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -264,16 +264,14 @@ public:
     {
         if (!item)
         {
-            handler->SendSysMessage(LANG_COMMAND_NEEDITEMSEND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NEEDITEMSEND);
             return false;
         }
 
         Creature* vendor = handler->getSelectedCreature();
         if (!vendor)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -302,8 +300,7 @@ public:
         CreatureData const* data = sObjectMgr->GetCreatureData(lowGuid);
         if (!data)
         {
-            handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, uint32(lowGuid));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_CREATGUIDNOTFOUND, uint32(lowGuid));
             return false;
         }
 
@@ -341,8 +338,7 @@ public:
         Unit* unit = handler->getSelectedUnit();
         if (!unit || unit->GetTypeId() != TYPEID_UNIT)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
         Creature* creature = unit->ToCreature();
@@ -358,16 +354,14 @@ public:
     {
         if (lvl < 1 || lvl > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) + 3)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         Creature* creature = handler->getSelectedCreature();
         if (!creature || creature->IsPet())
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -385,8 +379,7 @@ public:
 
         if (!unit || unit->IsPet() || unit->IsTotem())
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -406,23 +399,20 @@ public:
         Creature* vendor = handler->getSelectedCreature();
         if (!vendor || !vendor->IsVendor())
         {
-            handler->SendSysMessage(LANG_COMMAND_VENDORSELECTION);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_VENDORSELECTION);
             return false;
         }
 
         if (!item)
         {
-            handler->SendSysMessage(LANG_COMMAND_NEEDITEMSEND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NEEDITEMSEND);
             return false;
         }
 
         uint32 itemId = item->ItemId;
         if (!sObjectMgr->RemoveVendorItem(addMulti.value_or(false) ? handler->GetSession()->GetCurrentVendor() : vendor->GetEntry(), itemId))
         {
-            handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST, itemId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_ITEM_NOT_IN_LIST, itemId);
             return false;
         }
 
@@ -435,8 +425,7 @@ public:
     {
         if (!sFactionTemplateStore.LookupEntry(factionId))
         {
-            handler->PSendSysMessage(LANG_WRONG_FACTION, factionId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_WRONG_FACTION, factionId);
             return false;
         }
 
@@ -444,8 +433,7 @@ public:
 
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -512,8 +500,7 @@ public:
 
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -538,8 +525,7 @@ public:
 
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -557,8 +543,7 @@ public:
 
         if (!creature)
         {
-            handler->PSendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -575,8 +560,7 @@ public:
 
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -651,8 +635,7 @@ public:
 
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -736,15 +719,13 @@ public:
         CreatureData const* data = sObjectMgr->GetCreatureData(lowguid);
         if (!data)
         {
-            handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
             return false;
         }
 
         if (handler->GetSession()->GetPlayer()->GetMapId() != data->mapid)
         {
-            handler->PSendSysMessage(LANG_COMMAND_CREATUREATSAMEMAP, lowguid);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_CREATUREATSAMEMAP, lowguid);
             return false;
         }
 
@@ -792,8 +773,7 @@ public:
         Creature* target = handler->getSelectedCreature();
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -809,15 +789,13 @@ public:
 
         if (!creature || creature->IsPet())
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
         if (!sCreatureDisplayInfoStore.LookupEntry(displayId))
         {
-            handler->PSendSysMessage(LANG_COMMAND_FACTION_INVPARAM, Acore::ToString(displayId).c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_FACTION_INVPARAM, Acore::ToString(displayId).c_str());
             return false;
         }
 
@@ -875,8 +853,7 @@ public:
                 CreatureData const* data = sObjectMgr->GetCreatureData(lowguid);
                 if (!data)
                 {
-                    handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
-                    handler->SetSentErrorMessage(true);
+                    handler->SendErrorMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
                     return false;
                 }
             }
@@ -945,16 +922,14 @@ public:
     {
         if (phasemask == 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
         Creature* creature = handler->getSelectedCreature();
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -1020,8 +995,7 @@ public:
 
         if (Acore::StringTo<int32>(spawnTimeStr).value_or(0) < 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -1037,8 +1011,7 @@ public:
 
         if (spawnTime <= 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -1061,8 +1034,7 @@ public:
         Creature* creature = handler->getSelectedCreature();
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -1089,8 +1061,7 @@ public:
 
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -1107,16 +1078,14 @@ public:
 
         if (!creature)
         {
-            handler->PSendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
         if (/*creature->GetMotionMaster()->empty() ||*/
             creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FOLLOW_MOTION_TYPE)
         {
-            handler->PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName().c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName().c_str());
             return false;
         }
 
@@ -1124,8 +1093,7 @@ public:
 
         if (mgen->GetTarget() != player)
         {
-            handler->PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName().c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName().c_str());
             return false;
         }
 
@@ -1145,8 +1113,7 @@ public:
         Creature* creature = handler->getSelectedCreature();
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -1167,8 +1134,7 @@ public:
         Creature* creature = handler->getSelectedCreature();
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -1208,8 +1174,7 @@ public:
 
         if (player->IsExistPet())
         {
-            handler->SendSysMessage(LANG_YOU_ALREADY_HAVE_PET);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_YOU_ALREADY_HAVE_PET);
             return false;
         }
 
@@ -1224,8 +1189,7 @@ public:
 
         if (!player->CreatePet(creatureTarget))
         {
-            handler->PSendSysMessage(LANG_CREATURE_NON_TAMEABLE, cInfo->Entry);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CREATURE_NON_TAMEABLE, cInfo->Entry);
             return false;
         }
 
@@ -1238,8 +1202,7 @@ public:
 
         if (!creature || !creature->GetSpawnId())
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -1283,22 +1246,19 @@ public:
 
         if (!creature)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
         if (!creature->GetSpawnId())
         {
-            handler->PSendSysMessage("Selected creature %u isn't in creature table", creature->GetGUID().GetCounter());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Selected creature %u isn't in creature table", creature->GetGUID().GetCounter());
             return false;
         }
 
         if (!sObjectMgr->SetCreatureLinkedRespawn(creature->GetSpawnId(), linkguid))
         {
-            handler->PSendSysMessage("Selected creature can't link with guid '%u'", linkguid);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Selected creature can't link with guid '%u'", linkguid);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp
index 5134d46ae..c9058b400 100644
--- a/src/server/scripts/Commands/cs_pet.cpp
+++ b/src/server/scripts/Commands/cs_pet.cpp
@@ -56,8 +56,7 @@ public:
 
         if (!creatureTarget || creatureTarget->IsPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER)
         {
-            handler->PSendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
@@ -65,22 +64,19 @@ public:
         // Creatures with family 0 crashes the server
         if (!creatrueTemplate->family)
         {
-            handler->PSendSysMessage(LANG_CREATURE_NON_TAMEABLE, creatrueTemplate->Entry);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CREATURE_NON_TAMEABLE, creatrueTemplate->Entry);
             return false;
         }
 
         if (player->IsExistPet())
         {
-            handler->SendSysMessage(LANG_YOU_ALREADY_HAVE_PET);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_YOU_ALREADY_HAVE_PET);
             return false;
         }
 
         if (!player->CreatePet(creatureTarget))
         {
-            handler->PSendSysMessage(LANG_CREATURE_NON_TAMEABLE, creatrueTemplate->Entry);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CREATURE_NON_TAMEABLE, creatrueTemplate->Entry);
             return false;
         }
 
@@ -91,23 +87,20 @@ public:
     {
         if (!spell)
         {
-            handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NOSPELLFOUND);
             return false;
         }
 
         if (!SpellMgr::IsSpellValid(spell))
         {
-            handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
             return false;
         }
 
         Pet* pet = handler->GetSession()->GetPlayer()->GetPet();
         if (!pet)
         {
-            handler->PSendSysMessage("You have no pet");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("You have no pet");
             return false;
         }
 
@@ -115,16 +108,14 @@ public:
         uint32 spellDifficultyId = sSpellMgr->GetSpellDifficultyId(spell->Id);
         if (bounds.first != bounds.second || spellDifficultyId)
         {
-            handler->PSendSysMessage("Spell %u cannot be learnt using a command!", spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Spell %u cannot be learnt using a command!", spell->Id);
             return false;
         }
 
         // Check if pet already has it
         if (pet->HasSpell(spell->Id))
         {
-            handler->PSendSysMessage("Pet already has spell: %u", spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Pet already has spell: %u", spell->Id);
             return false;
         }
 
@@ -138,23 +129,20 @@ public:
     {
         if (!spell)
         {
-            handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_NOSPELLFOUND);
             return false;
         }
 
         if (!SpellMgr::IsSpellValid(spell))
         {
-            handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_SPELL_BROKEN, spell->Id);
             return false;
         }
 
         Pet* pet = handler->GetSession()->GetPlayer()->GetPet();
         if (!pet)
         {
-            handler->PSendSysMessage("You have no pet");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("You have no pet");
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
index 3940ca8d2..941e011fb 100644
--- a/src/server/scripts/Commands/cs_quest.cpp
+++ b/src/server/scripts/Commands/cs_quest.cpp
@@ -61,8 +61,7 @@ public:
 
         if (!playerTarget)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -74,8 +73,7 @@ public:
 
         if (result != itc->end())
         {
-            handler->PSendSysMessage(LANG_COMMAND_QUEST_STARTFROMITEM, entry, result->second.ItemId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_QUEST_STARTFROMITEM, entry, result->second.ItemId);
             return false;
         }
 
@@ -83,8 +81,7 @@ public:
         {
             if (player->IsActiveQuest(entry))
             {
-                handler->PSendSysMessage(LANG_COMMAND_QUEST_ACTIVE, quest->GetTitle().c_str(), entry);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_QUEST_ACTIVE, quest->GetTitle().c_str(), entry);
                 return false;
             }
 
@@ -101,8 +98,7 @@ public:
 
             if (result)
             {
-                handler->PSendSysMessage(LANG_COMMAND_QUEST_ACTIVE, quest->GetTitle().c_str(), entry);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_QUEST_ACTIVE, quest->GetTitle().c_str(), entry);
                 return false;
             }
 
@@ -144,8 +140,7 @@ public:
 
         if (!playerTarget)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -153,8 +148,7 @@ public:
 
         if (!quest)
         {
-            handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
             return false;
         }
 
@@ -236,8 +230,7 @@ public:
 
         if (!playerTarget)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -248,8 +241,7 @@ public:
             // If player doesn't have the quest
             if (player->GetQuestStatus(entry) == QUEST_STATUS_NONE)
             {
-                handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
                 return false;
             }
 
@@ -352,8 +344,7 @@ public:
 
             if (!result)
             {
-                handler->PSendSysMessage(LANG_COMMAND_QUEST_NOT_FOUND_IN_LOG, quest->GetTitle(), entry);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_QUEST_NOT_FOUND_IN_LOG, quest->GetTitle(), entry);
                 return false;
             }
 
@@ -505,8 +496,7 @@ public:
 
         if (!playerTarget)
         {
-            handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
             return false;
         }
 
@@ -517,8 +507,7 @@ public:
             // If player doesn't have the quest
             if (player->GetQuestStatus(entry) != QUEST_STATUS_COMPLETE)
             {
-                handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
                 return false;
             }
 
@@ -540,8 +529,7 @@ public:
 
             if (!result)
             {
-                handler->SendSysMessage(LANG_COMMAND_QUEST_NOT_COMPLETE);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_QUEST_NOT_COMPLETE);
                 return false;
             }
 
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index 17f312327..a1e177f21 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -280,8 +280,7 @@ public:
     {
         if (sScriptMgr->IsScriptScheduled())
         {
-            handler->PSendSysMessage("DB scripts used currently, please attempt reload later.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("DB scripts used currently, please attempt reload later.");
             return false;
         }
 
@@ -728,8 +727,7 @@ public:
     {
         if (!sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED))
         {
-            handler->SendSysMessage("Warden system disabled by config - reloading warden_action skipped.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("Warden system disabled by config - reloading warden_action skipped.");
             return false;
         }
 
@@ -961,8 +959,7 @@ public:
     {
         if (sScriptMgr->IsScriptScheduled())
         {
-            handler->SendSysMessage("DB scripts used currently, please attempt reload later.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("DB scripts used currently, please attempt reload later.");
             return false;
         }
 
@@ -979,8 +976,7 @@ public:
     {
         if (sScriptMgr->IsScriptScheduled())
         {
-            handler->SendSysMessage("DB scripts used currently, please attempt reload later.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("DB scripts used currently, please attempt reload later.");
             return false;
         }
 
@@ -1006,8 +1002,7 @@ public:
     {
         if (sScriptMgr->IsScriptScheduled())
         {
-            handler->SendSysMessage("DB scripts used currently, please attempt reload later.");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("DB scripts used currently, please attempt reload later.");
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index 1f6373158..69758acb9 100644
--- a/src/server/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
@@ -229,8 +229,7 @@ public:
         }
         else
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -282,8 +281,7 @@ public:
         }
         else
         {
-            handler->PSendSysMessage(LANG_RESETALL_UNKNOWN_CASE, caseName);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_RESETALL_UNKNOWN_CASE, caseName);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp
index be2040cfa..cc19fba24 100644
--- a/src/server/scripts/Commands/cs_send.cpp
+++ b/src/server/scripts/Commands/cs_send.cpp
@@ -89,15 +89,13 @@ public:
             ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemID);
             if (!itemTemplate)
             {
-                handler->PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, itemID);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_ITEMIDINVALID, itemID);
                 return false;
             }
 
             if (!itemCount || (itemTemplate->MaxCount > 0 && itemCount > uint32(itemTemplate->MaxCount)))
             {
-                handler->PSendSysMessage(LANG_COMMAND_INVALID_ITEM_COUNT, itemCount, itemID);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_INVALID_ITEM_COUNT, itemCount, itemID);
                 return false;
             }
 
@@ -111,8 +109,7 @@ public:
 
             if (itemList.size() > MAX_MAIL_ITEMS)
             {
-                handler->PSendSysMessage(LANG_COMMAND_MAIL_ITEMS_LIMIT, MAX_MAIL_ITEMS);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_COMMAND_MAIL_ITEMS_LIMIT, MAX_MAIL_ITEMS);
                 return false;
             }
         }
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index fe76fb503..b7495b409 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -307,8 +307,7 @@ public:
 
         if (Acore::StringTo<int32>(time).value_or(0) < 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -333,8 +332,7 @@ public:
 
         if (delay <= 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -362,8 +360,7 @@ public:
 
         if (Acore::StringTo<int32>(time).value_or(0) < 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -388,8 +385,7 @@ public:
 
         if (delay <= 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -417,8 +413,7 @@ public:
 
         if (Acore::StringTo<int32>(time).value_or(0) < 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -443,8 +438,7 @@ public:
 
         if (delay <= 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -472,8 +466,7 @@ public:
 
         if (Acore::StringTo<int32>(time).value_or(0) < 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -498,8 +491,7 @@ public:
 
         if (delay <= 0)
         {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_BAD_VALUE);
             return false;
         }
 
@@ -577,8 +569,7 @@ public:
             return true;
         }
 
-        handler->SendSysMessage(LANG_USE_BOL);
-        handler->SetSentErrorMessage(true);
+        handler->SendErrorMessage(LANG_USE_BOL);
         return false;
     }
 
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index cf0e14e22..12335e5fd 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -75,8 +75,7 @@ public:
 
         if (sObjectMgr->GetGameTele(name))
         {
-            handler->SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_TP_ALREADYEXIST);
             return false;
         }
 
@@ -94,8 +93,7 @@ public:
         }
         else
         {
-            handler->SendSysMessage(LANG_COMMAND_TP_ADDEDERR);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_TP_ADDEDERR);
             return false;
         }
 
@@ -106,8 +104,7 @@ public:
     {
         if (!tele)
         {
-            handler->SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_TELE_NOTFOUND);
             return false;
         }
         std::string name = tele->name;
@@ -120,8 +117,7 @@ public:
     {
         if (!MapMgr::IsValidMapCoord(mapId, pos) || sObjectMgr->IsTransportMap(mapId))
         {
-            handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, pos.GetPositionX(), pos.GetPositionY(), mapId);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, pos.GetPositionX(), pos.GetPositionY(), mapId);
             return false;
         }
 
@@ -135,8 +131,7 @@ public:
 
             if (target->IsBeingTeleported())
             {
-                handler->PSendSysMessage(LANG_IS_TELEPORTED, chrNameLink.c_str());
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_IS_TELEPORTED, chrNameLink.c_str());
                 return false;
             }
 
@@ -212,16 +207,14 @@ public:
     {
         if (!tele)
         {
-            handler->SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_TELE_NOTFOUND);
             return false;
         }
 
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -232,8 +225,7 @@ public:
         MapEntry const* map = sMapStore.LookupEntry(tele->mapId);
         if (!map || map->IsBattlegroundOrArena())
         {
-            handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CANNOT_TELE_TO_BG);
             return false;
         }
 
@@ -242,8 +234,7 @@ public:
         Group* grp = target->GetGroup();
         if (!grp)
         {
-            handler->PSendSysMessage(LANG_NOT_IN_GROUP, nameLink.c_str());
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NOT_IN_GROUP, nameLink.c_str());
             return false;
         }
 
@@ -289,24 +280,21 @@ public:
     {
         if (!tele)
         {
-            handler->SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_TELE_NOTFOUND);
             return false;
         }
 
         Player* player = handler->GetSession()->GetPlayer();
         if (player->IsInCombat())
         {
-            handler->SendSysMessage(LANG_YOU_IN_COMBAT);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_YOU_IN_COMBAT);
             return false;
         }
 
         MapEntry const* map = sMapStore.LookupEntry(tele->mapId);
         if (!map || (map->IsBattlegroundOrArena() && (player->GetMapId() != tele->mapId || !player->IsGameMaster())))
         {
-            handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_CANNOT_TELE_TO_BG);
             return false;
         }
 
@@ -342,8 +330,7 @@ public:
 
         if (!spawnpoint)
         {
-            handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOCREATNOTFOUND);
             return false;
         }
 
@@ -357,8 +344,7 @@ public:
         CreatureData const* spawnpoint = sObjectMgr->GetCreatureData(spawnId);
         if (!spawnpoint)
         {
-            handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOCREATNOTFOUND);
             return false;
         }
 
@@ -376,8 +362,7 @@ public:
         QueryResult result = WorldDatabase.Query("SELECT c.position_x, c.position_y, c.position_z, c.orientation, c.map, ct.name FROM creature c INNER JOIN creature_template ct ON c.id1 = ct.entry WHERE ct.name LIKE '{}'", normalizedName);
         if (!result)
         {
-            handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_COMMAND_GOCREATNOTFOUND);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp
index 4482e8267..089499486 100644
--- a/src/server/scripts/Commands/cs_titles.cpp
+++ b/src/server/scripts/Commands/cs_titles.cpp
@@ -60,8 +60,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -72,8 +71,7 @@ public:
         CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(titleId);
         if (!titleInfo)
         {
-            handler->PSendSysMessage(LANG_INVALID_TITLE_ID, uint32(titleId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TITLE_ID, uint32(titleId));
             return false;
         }
 
@@ -93,8 +91,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -105,8 +102,7 @@ public:
         CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(titleId);
         if (!titleInfo)
         {
-            handler->PSendSysMessage(LANG_INVALID_TITLE_ID, uint32(titleId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TITLE_ID, uint32(titleId));
             return false;
         }
 
@@ -124,8 +120,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
@@ -136,8 +131,7 @@ public:
         CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(titleId);
         if (!titleInfo)
         {
-            handler->PSendSysMessage(LANG_INVALID_TITLE_ID, uint32(titleId));
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_INVALID_TITLE_ID, uint32(titleId));
             return false;
         }
 
@@ -163,8 +157,7 @@ public:
         Player* target = handler->getSelectedPlayer();
         if (!target)
         {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
             return false;
         }
 
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 988801833..7d4b49342 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -163,15 +163,13 @@ public:
 
         if (!target)
         {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage(LANG_SELECT_CREATURE);
             return false;
         }
 
         if (target->GetEntry() == 1)
         {
-            handler->PSendSysMessage("%s%s|r", "|cffff33ff", "You want to load path to a waypoint? Aren't you?");
-            handler->SetSentErrorMessage(true);
+            handler->SendErrorMessage("%s%s|r", "|cffff33ff", "You want to load path to a waypoint? Aren't you?");
             return false;
         }
 
@@ -772,8 +770,7 @@ public:
 
             if (!target)
             {
-                handler->SendSysMessage(LANG_SELECT_CREATURE);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_SELECT_CREATURE);
                 return false;
             }
 
@@ -800,8 +797,7 @@ public:
             // Check if the user did specify a visual waypoint
             if (!target || target->GetEntry() != VISUAL_WAYPOINT)
             {
-                handler->PSendSysMessage(LANG_WAYPOINT_VP_SELECT);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_WAYPOINT_VP_SELECT);
                 return false;
             }
 
@@ -848,8 +844,7 @@ public:
 
             if (!result)
             {
-                handler->SendSysMessage("|cffff33ffPath no found.|r");
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage("|cffff33ffPath no found.|r");
                 return false;
             }
 
@@ -958,8 +953,7 @@ public:
             PreparedQueryResult result = WorldDatabase.Query(stmt);
             if (!result)
             {
-                handler->PSendSysMessage(LANG_WAYPOINT_NOTFOUND, pathid);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_WAYPOINT_NOTFOUND, pathid);
                 return false;
             }
 
@@ -1008,8 +1002,7 @@ public:
             PreparedQueryResult result = WorldDatabase.Query(stmt);
             if (!result)
             {
-                handler->PSendSysMessage(LANG_WAYPOINT_NOTFOUNDLAST, pathid);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_WAYPOINT_NOTFOUNDLAST, pathid);
                 return false;
             }
 
@@ -1056,8 +1049,7 @@ public:
             PreparedQueryResult result = WorldDatabase.Query(stmt);
             if (!result)
             {
-                handler->SendSysMessage(LANG_WAYPOINT_VP_NOTFOUND);
-                handler->SetSentErrorMessage(true);
+                handler->SendErrorMessage(LANG_WAYPOINT_VP_NOTFOUND);
                 return false;
             }