diff --git a/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java
index 1712e0d..549bb97 100755
--- a/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java
@@ -23,8 +23,8 @@ public class ExceptionListener implements Listener {
             return;
         if (lastthrown.stream()
                 .anyMatch(ex -> Arrays.equals(e.getException().getStackTrace(), ex.getStackTrace())
-                        && e.getException().getMessage() == null ? ex.getMessage() == null
-                        : e.getException().getMessage().equals(ex.getMessage())) // e.Exception.Message==ex.Message
+                        && (e.getException().getMessage() == null ? ex.getMessage() == null
+                        : e.getException().getMessage().equals(ex.getMessage()))) // e.Exception.Message==ex.Message
                 && lastsourcemsg.contains(e.getSourceMessage()))
             return;
         SendException(e.getException(), e.getSourceMessage());
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 6384b12..eb051f1 100755
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -121,7 +121,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
                     || ((DiscordSenderBase) e.getSender()).getChannel().getLongID() != ch.getLongID();
 
             if ((e.getChannel() == Channel.GlobalChat || e.getChannel().ID.equals("rp"))
-                    && isdifferentchannel.test(DiscordPlugin.chatchannel))
+                    && (!e.isFromcmd() || isdifferentchannel.test(DiscordPlugin.chatchannel)))
                 doit.accept(lastmsgdata == null
                         ? lastmsgdata = new LastMsgData(DiscordPlugin.chatchannel, null, null)
                         : lastmsgdata);
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
index 67a0cce..74ee6a2 100755
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
@@ -45,26 +45,28 @@ public class MCListener implements Listener {
     public void onPlayerJoin(TBMCPlayerJoinEvent e) {
         if (e.getPlayer() instanceof DiscordConnectedPlayer)
             return; // Don't show the joined message for the fake player
-        final Player p = e.getPlayer();
-        DiscordPlayer dp = e.GetPlayer().getAs(DiscordPlayer.class);
-        if (dp != null) {
-            val user = DiscordPlugin.dc.getUserByID(Long.parseLong(dp.getDiscordID()));
-            MCChatListener.OnlineSenders.put(dp.getDiscordID(),
-                    new DiscordPlayerSender(user, user.getOrCreatePMChannel(), p));
-            MCChatListener.OnlineSenders.put("P" + dp.getDiscordID(),
-                    new DiscordPlayerSender(user, DiscordPlugin.chatchannel, p));
-        }
-        if (ConnectCommand.WaitingToConnect.containsKey(e.GetPlayer().PlayerName().get())) {
-            IUser user = DiscordPlugin.dc
-                    .getUserByID(Long.parseLong(ConnectCommand.WaitingToConnect.get(e.GetPlayer().PlayerName().get())));
-            p.sendMessage("§bTo connect with the Discord account @" + user.getName() + "#" + user.getDiscriminator()
-                    + " do /discord accept");
-            p.sendMessage("§bIf it wasn't you, do /discord decline");
-        }
-        if (!DiscordPlugin.hooked)
-            MCChatListener.sendSystemMessageToChat(e.GetPlayer().PlayerName().get() + " joined the game");
-        MCChatListener.ListC = 0;
-        ChromaBot.getInstance().updatePlayerList();
+        Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, () -> {
+            final Player p = e.getPlayer();
+            DiscordPlayer dp = e.GetPlayer().getAs(DiscordPlayer.class);
+            if (dp != null) {
+                val user = DiscordPlugin.dc.getUserByID(Long.parseLong(dp.getDiscordID()));
+                MCChatListener.OnlineSenders.put(dp.getDiscordID(),
+                        new DiscordPlayerSender(user, user.getOrCreatePMChannel(), p));
+                MCChatListener.OnlineSenders.put("P" + dp.getDiscordID(),
+                        new DiscordPlayerSender(user, DiscordPlugin.chatchannel, p));
+            }
+            if (ConnectCommand.WaitingToConnect.containsKey(e.GetPlayer().PlayerName().get())) {
+                IUser user = DiscordPlugin.dc
+                        .getUserByID(Long.parseLong(ConnectCommand.WaitingToConnect.get(e.GetPlayer().PlayerName().get())));
+                p.sendMessage("§bTo connect with the Discord account @" + user.getName() + "#" + user.getDiscriminator()
+                        + " do /discord accept");
+                p.sendMessage("§bIf it wasn't you, do /discord decline");
+            }
+            if (!DiscordPlugin.hooked)
+                MCChatListener.sendSystemMessageToChat(e.GetPlayer().PlayerName().get() + " joined the game");
+            MCChatListener.ListC = 0;
+            ChromaBot.getInstance().updatePlayerList();
+        });
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)