2 files changed, 7 insertions, 5 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 40ff966be..e1f801c0b 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -300,8 +300,11 @@ impHandler(msg2)
     std::string recvnick;
     std::string message;
 
-    if ((chatHandler != nullptr) && splitWhisper(event.args, recvnick, message))
+    if (chatHandler != nullptr &&
+        splitWhisper(event.args, recvnick, message))
+    {
         chatHandler->privateMessage(recvnick, message);
+    }
     return true;
 }
 
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index bad59ec29..f22d7bc93 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -577,15 +577,14 @@ impHandler(sendMail)
 
 impHandler(info)
 {
-    if ((event.tab == nullptr) ||
-        (localPlayer == nullptr) ||
+    if (event.tab == nullptr ||
+        localPlayer == nullptr ||
         Net::getNetworkType() == ServerType::TMWATHENA)
     {
         return false;
     }
 
-    if ((event.tab != nullptr) &&
-        (guildHandler != nullptr) &&
+    if (guildHandler != nullptr &&
         event.tab->getType() == ChatTabType::GUILD)
     {
         const Guild *const guild = localPlayer->getGuild();