diff --git a/src/main/java/com/cnaude/purpleirc/ChannelWatcher.java b/src/main/java/com/cnaude/purpleirc/ChannelWatcher.java
index f7b0341..c0f8e1d 100644
--- a/src/main/java/com/cnaude/purpleirc/ChannelWatcher.java
+++ b/src/main/java/com/cnaude/purpleirc/ChannelWatcher.java
@@ -5,14 +5,14 @@
 
 /**
  *
- * @author Chris Naude
- * This thread checks each for users and updates the internal lists.
+ * @author Chris Naude This thread checks each for users and updates the
+ * internal lists.
  */
 public class ChannelWatcher {
-    
+
     private final PurpleIRC plugin;
     private final BukkitTask bt;
-    
+
     /**
      *
      * @param plugin
@@ -24,16 +24,12 @@ public ChannelWatcher(final PurpleIRC plugin) {
             @Override
             public void run() {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    if (ircBot.isConnected()) {
-                        for (Channel channel : ircBot.getChannels()) {
-                            ircBot.updateNickList(channel);
-                        }
-                    }
+                    ircBot.updateNickList();
                 }
             }
         }, plugin.ircChannelCheckInterval, plugin.ircChannelCheckInterval);
     }
-    
+
     /**
      *
      */
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/CleverNotchListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/CleverNotchListener.java
index 01395b3..7379fd0 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/CleverNotchListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/CleverNotchListener.java
@@ -33,9 +33,7 @@ public CleverNotchListener(PurpleIRC plugin) {
     @EventHandler
     public void onCleverEvent(CleverEvent event) {
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                ircBot.cleverChat(event.getName(),event.getMessage());
-            }
+            ircBot.cleverChat(event.getName(), event.getMessage());
         }
     }
 }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/DeathMessagesListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/DeathMessagesListener.java
index bd81860..742e9fb 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/DeathMessagesListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/DeathMessagesListener.java
@@ -35,9 +35,7 @@ public DeathMessagesListener(PurpleIRC plugin) {
     public void onDeathMessageEvent(DeathMessageEvent event) {
         plugin.logDebug("onDeathMessageEvent caught");
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                ircBot.gameDeath(event.getPlayer(), event.getDeathMessage(), TemplateName.DEATH_MESSAGES);
-            }
+            ircBot.gameDeath(event.getPlayer(), event.getDeathMessage(), TemplateName.DEATH_MESSAGES);
         }
     }
 }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/DynmapListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/DynmapListener.java
index 1171d7b..18a3cde 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/DynmapListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/DynmapListener.java
@@ -37,9 +37,7 @@ public void onDynmapWebChatEvent(DynmapWebChatEvent event) {
         String source = event.getSource();
         plugin.logDebug("DynmapWebChat: " + source + " : " + name + ":" + message);
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                ircBot.dynmapWebChat(source, name, message);
-            }
+            ircBot.dynmapWebChat(source, name, message);
         }
     }
 }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java
index 33c1f5b..861c37e 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java
@@ -33,12 +33,10 @@ public EssentialsListener(PurpleIRC plugin) {
      */
     @EventHandler
     public void onAfkStatusChangeEvent(AfkStatusChangeEvent event) {
-        IUser user = event.getAffected();     
+        IUser user = event.getAffected();
         plugin.logDebug("AFK: " + user.getName() + ":" + user.isAfk());
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                ircBot.essentialsAFK(user.getBase(),user.isAfk());
-            }
+            ircBot.essentialsAFK(user.getBase(), user.isAfk());
         }
     }
 }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java
index 55fe452..ee1716b 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.cnaude.purpleirc.GameListeners;
 
 import com.cnaude.purpleirc.PurpleBot;
@@ -48,9 +44,7 @@ public void onAsyncPlayerChat(AsyncPlayerChatEvent event) {
         if (event.getPlayer().hasPermission("irc.message.gamechat")) {
             plugin.logDebug("Player " + event.getPlayer().getName() + " has permission irc.message.gamechat");
             for (PurpleBot ircBot : plugin.ircBots.values()) {
-                if (ircBot.isConnected()) {
-                    ircBot.gameChat(event.getPlayer(), event.getMessage());
-                }
+                ircBot.gameChat(event.getPlayer(), event.getMessage());
             }
         } else {
             plugin.logDebug("Player " + event.getPlayer().getName() + " does not have irc.message.gamechat permission.");
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerCommandPreprocessingListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerCommandPreprocessingListener.java
index 9513eec..620118d 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerCommandPreprocessingListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerCommandPreprocessingListener.java
@@ -47,36 +47,27 @@ public void onPlayerCommandPreprocessEvent(PlayerCommandPreprocessEvent event) {
         if (event.getPlayer().hasPermission("irc.message.gamechat")) {
             if (msg.startsWith("/me ")) {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    if (ircBot.isConnected()) {
-                        ircBot.gameAction(event.getPlayer(), msg.replace("/me", ""));
-                    }
+                    ircBot.gameAction(event.getPlayer(), msg.replace("/me", ""));
                 }
             } else if (msg.startsWith("/broadcast ")) {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    if (ircBot.isConnected()) {
-                        ircBot.gameBroadcast(event.getPlayer(), msg.replace("/broadcast", ""));
-                    }
+                    ircBot.gameBroadcast(event.getPlayer(), msg.replace("/broadcast", ""));
                 }
             }
         }
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                if (msg.startsWith("/")) {
-                    String cmd;
-                    String params = "";
-                    if (msg.contains(" ")) {
-                        cmd = msg.split(" ", 2)[0];
-                        params = msg.split(" ", 2)[1];
-                    } else {
-                        cmd = msg;
-                    }
-
-                    cmd = cmd.substring(0);
-                    if (ircBot.isConnected()) {
-                        if (ircBot.channelCmdNotifyEnabled) {
-                            ircBot.commandNotify(event.getPlayer(), cmd, params);
-                        }
-                    }
+            if (msg.startsWith("/")) {
+                String cmd;
+                String params = "";
+                if (msg.contains(" ")) {
+                    cmd = msg.split(" ", 2)[0];
+                    params = msg.split(" ", 2)[1];
+                } else {
+                    cmd = msg;
+                }
+                cmd = cmd.substring(0);
+                if (ircBot.channelCmdNotifyEnabled) {
+                    ircBot.commandNotify(event.getPlayer(), cmd, params);
                 }
             }
         }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerDeathListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerDeathListener.java
index 65e0df5..0485013 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerDeathListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerDeathListener.java
@@ -36,10 +36,8 @@ public GamePlayerDeathListener(PurpleIRC plugin) {
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerDeathEvent(PlayerDeathEvent event) {
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                ircBot.gameDeath((Player) event.getEntity(), 
-                        event.getDeathMessage(), TemplateName.GAME_DEATH);
-            }
+            ircBot.gameDeath((Player) event.getEntity(),
+                    event.getDeathMessage(), TemplateName.GAME_DEATH);
         }
     }
 }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java
index 0fe4113..8ee6aa1 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java
@@ -47,11 +47,9 @@ public void onPlayerJoinEvent(final PlayerJoinEvent event) {
             @Override
             public void run() {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    if (ircBot.isConnected()) {
-                        ircBot.gameJoin(event.getPlayer(), event.getJoinMessage());
-                        if (plugin.netPackets != null) {
-                            plugin.netPackets.updateTabList(event.getPlayer());
-                        }
+                    ircBot.gameJoin(event.getPlayer(), event.getJoinMessage());
+                    if (plugin.netPackets != null) {
+                        plugin.netPackets.updateTabList(event.getPlayer());
                     }
                 }
             }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerKickListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerKickListener.java
index e7ff66b..fe907f1 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerKickListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerKickListener.java
@@ -32,15 +32,13 @@ public GamePlayerKickListener(PurpleIRC plugin) {
      * @param event
      */
     @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerKickEvent(PlayerKickEvent event) {        
+    public void onPlayerKickEvent(PlayerKickEvent event) {
         plugin.logDebug("KICK: " + event.getPlayer().getName());
         if (!plugin.kickedPlayers.contains(event.getPlayer().getName())) {
             plugin.kickedPlayers.add(event.getPlayer().getName());
         }
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                ircBot.gameKick(event.getPlayer(), event.getLeaveMessage(), event.getReason());                
-            }
+            ircBot.gameKick(event.getPlayer(), event.getLeaveMessage(), event.getReason());
         }
     }
 
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerPlayerAchievementAwardedListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerPlayerAchievementAwardedListener.java
index bedb893..307a77f 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerPlayerAchievementAwardedListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerPlayerAchievementAwardedListener.java
@@ -27,17 +27,15 @@ public GamePlayerPlayerAchievementAwardedListener(PurpleIRC plugin) {
         this.plugin = plugin;
     }
 
-       /**
+    /**
      *
      * @param event
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerAchievementAwardedEvent(PlayerAchievementAwardedEvent event) {
-        plugin.logDebug("ACHIEVEMENT: " + event.getPlayer().getName() + " => " + event.getAchievement());        
+        plugin.logDebug("ACHIEVEMENT: " + event.getPlayer().getName() + " => " + event.getAchievement());
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {                
-                ircBot.gameAchievement(event.getPlayer(), event.getAchievement());                
-            }
+            ircBot.gameAchievement(event.getPlayer(), event.getAchievement());
         }
     }
 }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerQuitListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerQuitListener.java
index 953279e..909d8b6 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerQuitListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerQuitListener.java
@@ -27,7 +27,7 @@ public GamePlayerQuitListener(PurpleIRC plugin) {
         this.plugin = plugin;
     }
 
-       /**
+    /**
      *
      * @param event
      */
@@ -36,17 +36,15 @@ public void onPlayerQuitEvent(PlayerQuitEvent event) {
         plugin.logDebug("QUIT: " + event.getPlayer().getName());
         if (plugin.kickedPlayers.contains(event.getPlayer().getName())) {
             plugin.kickedPlayers.remove(event.getPlayer().getName());
-            plugin.logDebug("Player " 
+            plugin.logDebug("Player "
                     + event.getPlayer().getName()
                     + " was in the recently kicked list. Not sending quit message.");
             return;
         }
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {                
-                ircBot.gameQuit(event.getPlayer(), event.getQuitMessage());
-                if (plugin.netPackets != null) {
-                    plugin.netPackets.updateTabList(event.getPlayer());
-                }
+            ircBot.gameQuit(event.getPlayer(), event.getQuitMessage());
+            if (plugin.netPackets != null) {
+                plugin.netPackets.updateTabList(event.getPlayer());
             }
         }
     }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GameServerCommandListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GameServerCommandListener.java
index bd02cd9..837062e 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GameServerCommandListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GameServerCommandListener.java
@@ -37,16 +37,12 @@ public void onServerCommandEvent(ServerCommandEvent event) {
         if (cmd.startsWith("say ")) {
             String msg = cmd.split(" ", 2)[1];
             for (PurpleBot ircBot : plugin.ircBots.values()) {
-                if (ircBot.isConnected()) {
-                    ircBot.consoleChat(msg);
-                }
+                ircBot.consoleChat(msg);
             }
         } else if (cmd.startsWith("broadcast ")) {
             String msg = cmd.split(" ", 2)[1];
             for (PurpleBot ircBot : plugin.ircBots.values()) {
-                if (ircBot.isConnected()) {
-                    ircBot.consoleBroadcast(msg);
-                }
+                ircBot.consoleBroadcast(msg);
             }
         } else {
             //plugin.logDebug("Invalid CE: " + cmd);
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java
index 8474396..cf10806 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java
@@ -44,15 +44,12 @@ public void onChannelChatEvent(ChannelChatEvent event) {
         if (player.hasPermission("irc.message.gamechat")
                 && chatter.getChannels().contains(event.getChannel())) {
             for (PurpleBot ircBot : plugin.ircBots.values()) {
-                if (ircBot.isConnected()) {
-                    if (plugin.heroChatEmoteFormat.equals(event.getFormat())) {
-                        plugin.logDebug("HC Emote: TRUE");
-                        ircBot.heroAction(chatter, chatColor, event.getMessage());
-                    } else {
-                        plugin.logDebug("HC Emote: FALSE");
-                        ircBot.heroChat(chatter, chatColor, event.getMessage());
-                    }
-
+                if (plugin.heroChatEmoteFormat.equals(event.getFormat())) {
+                    plugin.logDebug("HC Emote: TRUE");
+                    ircBot.heroAction(chatter, chatColor, event.getMessage());
+                } else {
+                    plugin.logDebug("HC Emote: FALSE");
+                    ircBot.heroChat(chatter, chatColor, event.getMessage());
                 }
             }
         }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java
index 51eb41c..def278d 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java
@@ -26,7 +26,7 @@ public McMMOChatListener(PurpleIRC plugin) {
     }
 
     @EventHandler
-    public void onMcMMOChatEvent(McMMOChatEvent event) {        
+    public void onMcMMOChatEvent(McMMOChatEvent event) {
         event.setMessage(event.getMessage().replace("[[townytag]]", ""));
         String sender = event.getSender();
         Player player = plugin.getServer().getPlayer(sender);
@@ -34,9 +34,7 @@ public void onMcMMOChatEvent(McMMOChatEvent event) {
         if (player != null && !sender.isEmpty()) {
             if (player.hasPermission("irc.message.gamechat")) {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    if (ircBot.isConnected()) {
-                        ircBot.mcMMOChat(player, event.getMessage());
-                    }
+                    ircBot.mcMMOChat(player, event.getMessage());
                 }
             }
         }
@@ -51,9 +49,7 @@ public void onMcMMOAdminChatEvent(McMMOAdminChatEvent event) {
         if (player != null && !sender.isEmpty()) {
             if (player.hasPermission("irc.message.gamechat")) {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    if (ircBot.isConnected()) {
-                        ircBot.mcMMOAdminChat(player, event.getMessage());
-                    }
+                    ircBot.mcMMOAdminChat(player, event.getMessage());
                 }
             }
         }
@@ -69,9 +65,7 @@ public void onMcMMOPartyChatEvent(McMMOPartyChatEvent event) {
         if (player != null && !sender.isEmpty()) {
             if (player.hasPermission("irc.message.gamechat")) {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    if (ircBot.isConnected()) {
-                        ircBot.mcMMOPartyChat(player, party, event.getMessage());
-                    }
+                    ircBot.mcMMOPartyChat(player, party, event.getMessage());
                 }
             }
         }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/OreBroadcastListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/OreBroadcastListener.java
index 7f24687..7de21e5 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/OreBroadcastListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/OreBroadcastListener.java
@@ -37,9 +37,7 @@ public OreBroadcastListener(PurpleIRC plugin) {
     public void onOreBroadcastEvent(OreBroadcastEvent event) {
         plugin.logDebug("onOreBroadcastEvent caught");
         for (PurpleBot ircBot : plugin.ircBots.values()) {
-            if (ircBot.isConnected()) {
-                ircBot.gameOreBroadcast(event.getPlayer(), event.getMessage());
-            }
+            ircBot.gameOreBroadcast(event.getPlayer(), event.getMessage());
         }
     }
 }
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/TitanChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/TitanChatListener.java
index 2f2ede5..9b8c9e4 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/TitanChatListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/TitanChatListener.java
@@ -41,9 +41,7 @@ public void onChannelChatEvent(ChannelChatEvent event) {
         String tColor = event.getChannel().getDisplayColour();
         if (player.hasPermission("irc.message.gamechat")) {
             for (PurpleBot ircBot : plugin.ircBots.values()) {
-                if (ircBot.isConnected()) {
-                    ircBot.titanChat(participant, tChannel, tColor, event.getMessage());
-                }
+                ircBot.titanChat(participant, tChannel, tColor, event.getMessage());
             }
         }
     }
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
index 64f0aaf..d96fea8 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -799,8 +799,7 @@ private boolean isPlayerInValidWorld(Player player, String channelName) {
         return false;
     }
 
-    // Called from normal game chat listener
-    /**
+    /** Called from normal game chat listener
      *
      * @param player
      * @param message
@@ -865,11 +864,11 @@ public void gameChat(Player player, String message) {
      * @param message
      */
     public void heroChat(Chatter chatter, ChatColor chatColor, String message) {
-        plugin.logDebug("H1");
-        Player player = chatter.getPlayer();
         if (!this.isConnected()) {
             return;
         }
+        plugin.logDebug("H1");
+        Player player = chatter.getPlayer();
         plugin.logDebug("H2");
         for (String channelName : botChannels) {
             plugin.logDebug("H3");
@@ -898,6 +897,9 @@ public void heroChat(Chatter chatter, ChatColor chatColor, String message) {
     }
 
     public void mcMMOAdminChat(Player player, String message) {
+        if (!this.isConnected()) {
+            return;
+        }
         for (String channelName : botChannels) {
             if (!isPlayerInValidWorld(player, channelName)) {
                 continue;
@@ -915,6 +917,9 @@ public void mcMMOAdminChat(Player player, String message) {
     }
 
     public void mcMMOPartyChat(Player player, String partyName, String message) {
+        if (!this.isConnected()) {
+            return;
+        }
         for (String channelName : botChannels) {
             if (!isPlayerInValidWorld(player, channelName)) {
                 continue;
@@ -932,6 +937,9 @@ public void mcMMOPartyChat(Player player, String partyName, String message) {
     }
 
     public void mcMMOChat(Player player, String message) {
+        if (!this.isConnected()) {
+            return;
+        }
         for (String channelName : botChannels) {
             if (!isPlayerInValidWorld(player, channelName)) {
                 continue;
@@ -948,8 +956,7 @@ public void mcMMOChat(Player player, String message) {
         }
     }
 
-    public void townyChat(Player player,
-            com.palmergames.bukkit.TownyChat.channels.Channel townyChannel, String message) {
+    public void townyChat(Player player, com.palmergames.bukkit.TownyChat.channels.Channel townyChannel, String message) {
         if (!this.isConnected()) {
             return;
         }
@@ -975,10 +982,10 @@ public void townyChat(Player player,
     }
 
     public void heroAction(Chatter chatter, ChatColor chatColor, String message) {
-        Player player = chatter.getPlayer();
         if (!this.isConnected()) {
             return;
         }
+        Player player = chatter.getPlayer();
         for (String channelName : botChannels) {
             if (!isPlayerInValidWorld(player, channelName)) {
                 continue;
@@ -1008,10 +1015,10 @@ public void heroAction(Chatter chatter, ChatColor chatColor, String message) {
      * @param message
      */
     public void titanChat(Participant participant, String tChannel, String tColor, String message) {
-        Player player = plugin.getServer().getPlayer(participant.getName());
         if (!this.isConnected()) {
             return;
         }
+        Player player = plugin.getServer().getPlayer(participant.getName());
         for (String channelName : botChannels) {
             if (!isPlayerInValidWorld(player, channelName)) {
                 continue;
@@ -1143,7 +1150,9 @@ public void gameBroadcast(Player player, String message) {
         for (String channelName : botChannels) {
             if (enabledMessages.get(channelName).contains("broadcast-message")) {
                 asyncIRCMessage(channelName, plugin.tokenizer
-                        .gameChatToIRCTokenizer(player, plugin.getMsgTemplate(botNick, "broadcast-message"), ChatColor.translateAlternateColorCodes('&', message)));
+                        .gameChatToIRCTokenizer(player, plugin
+                                .getMsgTemplate(botNick, "broadcast-message"), 
+                                ChatColor.translateAlternateColorCodes('&', message)));
             }
         }
     }
@@ -1271,10 +1280,10 @@ public void gameQuit(Player player, String message) {
      * @param achievement
      */
     public void gameAchievement(Player player, Achievement achievement) {
-        String message = achievement.toString();
         if (!this.isConnected()) {
             return;
         }
+        String message = achievement.toString();
         for (String channelName : botChannels) {
             if (enabledMessages.get(channelName).contains(TemplateName.GAME_ACHIEVEMENT)) {
                 if (!isPlayerInValidWorld(player, channelName)) {
@@ -1785,7 +1794,7 @@ public void sendUserList(CommandSender sender, Channel channel) {
         }
     }
 
-    public String getNickPrefix(User user, Channel channel) {        
+    public String getNickPrefix(User user, Channel channel) {
         try {
             if (user.getChannels() != null) {
                 if (user.isIrcop()) {
@@ -1818,11 +1827,26 @@ public void sendUserList(CommandSender sender) {
         }
     }
 
+    /**
+     *
+     */
+    public void updateNickList() {
+        if (!this.isConnected()) {
+            return;
+        }
+        for (Channel channel : this.getChannels()) {
+            this.updateNickList(channel);
+        }
+    }
+
     /**
      *
      * @param channel
      */
     public void updateNickList(Channel channel) {
+        if (!this.isConnected()) {
+            return;
+        }
         // Build current list of names in channel
         ArrayList<String> users = new ArrayList<String>();
         for (User user : channel.getUsers()) {
@@ -2406,6 +2430,9 @@ public void broadcastIRCConnect(String nick) {
      * @param params
      */
     public void commandNotify(Player player, String cmd, String params) {
+        if (!this.isConnected()) {
+            return;
+        }
         String msg = plugin.tokenizer.gameCommandToIRCTokenizer(player,
                 plugin.getMsgTemplate(botNick, TemplateName.GAME_COMMAND), cmd, params);
         if (channelCmdNotifyMode.equalsIgnoreCase("msg")) {
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
index 9b60821..c6c7927 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -87,7 +87,7 @@ public void remFromTabList(String name) {
             plugin.logError(e.getMessage());
         }
     }
-
+    
     /**
      *
      * @param player