diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 05184aa19..df39d710c 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -28,7 +28,6 @@ using SteamKit2;
 using SteamKit2.Internal;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -1654,8 +1653,8 @@ namespace ArchiSteamFarm {
 		}
 
 		private async void OnChatMsg(SteamFriends.ChatMsgCallback callback) {
-			if ((callback == null) || (callback.ChatRoomID == null) || (callback.ChatterID == null) || string.IsNullOrEmpty(callback.Message)) {
-				Logging.LogNullError(nameof(callback) + " || " + nameof(callback.ChatRoomID) + " || " + nameof(callback.ChatterID) + " || " + nameof(callback.Message), BotName);
+			if (callback == null) {
+				Logging.LogNullError(nameof(callback), BotName);
 				return;
 			}
 
@@ -1663,6 +1662,11 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			if (callback.ChatRoomID == null || callback.ChatterID == null || string.IsNullOrEmpty(callback.Message)) {
+				Logging.LogNullError(nameof(callback.ChatRoomID) + " || " + nameof(callback.ChatterID) + " || " + nameof(callback.Message));
+				return;
+			}
+
 			switch (callback.Message) {
 				case "!leave":
 					if (!IsMaster(callback.ChatterID)) {
@@ -1700,8 +1704,8 @@ namespace ArchiSteamFarm {
 		}
 
 		private async void OnFriendMsg(SteamFriends.FriendMsgCallback callback) {
-			if ((callback == null) || (callback.Sender == null) || string.IsNullOrEmpty(callback.Message)) {
-				Logging.LogNullError(nameof(callback) + " || " + nameof(callback.Sender) + " || " + nameof(callback.Message), BotName);
+			if (callback == null) {
+				Logging.LogNullError(nameof(callback), BotName);
 				return;
 			}
 
@@ -1709,6 +1713,11 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			if ((callback.Sender == null) || string.IsNullOrEmpty(callback.Message)) {
+				Logging.LogNullError(nameof(callback.Sender) + " || " + nameof(callback.Message));
+				return;
+			}
+
 			await HandleMessage(callback.Sender, callback.Sender, callback.Message).ConfigureAwait(false);
 		}