diff --git a/src/net/citizensnpcs/command/CommandManager.java b/src/net/citizensnpcs/command/CommandManager.java
index b90bd235b..53b7ef7de 100644
--- a/src/net/citizensnpcs/command/CommandManager.java
+++ b/src/net/citizensnpcs/command/CommandManager.java
@@ -94,7 +94,7 @@ public class CommandManager {
     // Attempt to execute a command.
     public void executeMethod(Method parent, String[] args, Player player, Object[] methodArgs) throws CommandException {
         String cmdName = args[0];
-        String modifier = args.length >= 1 ? args[1] : "";
+        String modifier = args.length > 1 ? args[1] : "";
 
         Method method = commands.get(cmdName.toLowerCase() + " " + modifier.toLowerCase());
         if (method == null)
@@ -157,9 +157,8 @@ public class CommandManager {
         Set<String> cmds = new HashSet<String>();
         for (String cmd : commands.keySet()) {
             String[] split = cmd.split(" ");
-            if (split[0].equalsIgnoreCase(command)) {
+            if (split[0].equalsIgnoreCase(command) && split.length > 1)
                 cmds.add(split[1]);
-            }
         }
 
         return cmds.toArray(new String[cmds.size()]);
diff --git a/src/net/citizensnpcs/command/command/NPCCommands.java b/src/net/citizensnpcs/command/command/NPCCommands.java
index ef69a7f98..a278711ee 100644
--- a/src/net/citizensnpcs/command/command/NPCCommands.java
+++ b/src/net/citizensnpcs/command/command/NPCCommands.java
@@ -41,7 +41,7 @@ public class NPCCommands {
     public void showInfo(CommandContext args, Player player, NPC npc) {
         Messaging.send(player, StringHelper.wrapHeader(npc.getName()));
         Messaging.send(player, "    <a>ID: <e>" + npc.getId());
-        Messaging.send(player, "    <a>Character: <e>" + npc.getId());
+        Messaging.send(player, "    <a>Character: <e>" + npc.getCharacter().getName());
     }
 
     @Command(