diff --git a/appinfo.properties b/appinfo.properties
index 0eae0baf..56169aee 100644
--- a/appinfo.properties
+++ b/appinfo.properties
@@ -1,6 +1,6 @@
-#Wed, 10 Jul 2013 23:58:09 +0200
+#Sat, 13 Jul 2013 12:48:46 +0200
 
 program.VERSION=2.21
-program.BUILDNUM=301
-program.BUILDDATE=07/10/2013 11\:58 PM
+program.BUILDNUM=306
+program.BUILDDATE=07/13/2013 12\:48 PM
 
diff --git a/buildnumber.properties b/buildnumber.properties
index 624e87d0..39e88ced 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Jul 10 23:58:09 CEST 2013
-build.number=302
+#Sat Jul 13 12:48:46 CEST 2013
+build.number=307
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java
index 2f874683..2c26cdea 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java
@@ -139,7 +139,7 @@ public class TFM_CommandLoader
             this.blockHostConsole = blockHostConsole;
             this.description = description;
             this.usage = usage;
-            this.aliases = Arrays.asList(aliases.split(","));
+            this.aliases = ("".equals(aliases) ? new ArrayList<String>() : Arrays.asList(aliases.split(",")));
         }
 
         public List<String> getAliases()
diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
index a526932b..9f8205b4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
@@ -126,7 +126,7 @@ public class TotalFreedomMod extends JavaPlugin
     public void onDisable()
     {
         server.getScheduler().cancelTasks(this);
-        TFM_Log.info("Plugin Disabled");
+        TFM_Log.info("Plugin disabled");
     }
 
     @Override
@@ -153,11 +153,6 @@ public class TotalFreedomMod extends JavaPlugin
                         commandLabel,
                         StringUtils.join(args, " ")), true);
             }
-            
-            if ("".equals(commandLabel))
-            {
-                return false;
-            }
 
             TFM_Command dispatcher;
             try
@@ -189,7 +184,6 @@ public class TotalFreedomMod extends JavaPlugin
                 TFM_Log.severe("Command Error: " + commandLabel + "\n" + ExceptionUtils.getStackTrace(ex));
             }
 
-            dispatcher = null;
         }
         catch (Throwable ex)
         {