diff --git a/com/gmail/Ne0nx3r0/BetterAliasCommandListener.java b/com/gmail/Ne0nx3r0/BetterAliasCommandListener.java
deleted file mode 100644
index dd394b1..0000000
--- a/com/gmail/Ne0nx3r0/BetterAliasCommandListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//TODO: remove if not implemented
-
-package com.gmail.Ne0nx3r0;
-
-import com.gmail.Ne0nx3r0.AliasManager.AliasManager;
-import org.bukkit.command.CommandSender;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-class BetterAliasCommandListener implements Listener{
-        private final BetterAlias plugin;
-        private final AliasManager aliasManager;
-    
-	BetterAliasCommandListener(BetterAlias p, AliasManager am) {
-            this.plugin = p;
-            this.aliasManager = am;
-	}
-
-	@EventHandler
-	public void onServerCommandEvent(CommandSender sender, String command){
-            System.out.println(sender);
-            System.out.println(command);
-	}
-}
\ No newline at end of file
diff --git a/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java b/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java
index 5e38927..eafe13b 100644
--- a/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java
+++ b/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java
@@ -72,8 +72,10 @@ class BetterAliasPlayerListener implements Listener{
                                     iParam = Integer.parseInt(text);  
                                 } catch(Exception ex){}
                                 
-                                if(iParam > -1 && cmd.length >= iParam){
+                                if(iParam > -1 && cmd.length-1 >= iParam){
                                     text = cmd[iParam];
+                                }else{
+                                    text = "";
                                 }
                             }