diff --git a/buildnumber.properties b/buildnumber.properties
index d3ffa48c..8eace633 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sat Nov 30 20:40:55 CET 2013
-build.number=636
+#Sun Dec 01 11:54:49 CET 2013
+build.number=638
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
index ddac41e8..69291cf4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
@@ -66,8 +66,8 @@ public class Command_list extends TFM_Command
 
             if (userSuperadmin)
             {
-                TFM_Superadmin entry = TFM_SuperadminList.getAdminEntry(player.getName());
-                if (!entry.isSeniorAdmin() && entry.isTelnetAdmin())
+                final TFM_Superadmin entry = TFM_SuperadminList.getAdminEntry(player.getName());
+                if (entry != null && !entry.isSeniorAdmin() && entry.isTelnetAdmin())
                 {
                     prefix = (ChatColor.DARK_GREEN + "[STA]");
                 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java
index 6f99282c..b9501033 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java
@@ -160,13 +160,13 @@ public class TFM_SuperadminList
         }
     }
 
-    public static TFM_Superadmin getAdminEntry(String admin_name)
+    public static TFM_Superadmin getAdminEntry(String name)
     {
-        admin_name = admin_name.toLowerCase();
+        name = name.toLowerCase();
 
-        if (superadminList.containsKey(admin_name))
+        if (superadminList.containsKey(name))
         {
-            return superadminList.get(admin_name);
+            return superadminList.get(name);
         }
         else
         {
diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
index f16338b6..6d4db9cc 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
@@ -241,6 +241,7 @@ public class TotalFreedomMod extends JavaPlugin
             catch (Throwable ex)
             {
                 TFM_Log.severe("Command Error: " + commandLabel + "\n" + ExceptionUtils.getStackTrace(ex));
+                sender.sendMessage(ChatColor.RED + "Command Error: " + ex.getMessage());
             }
 
         }