Added null check and removed unused method from Fillr

2 files changed, 10 insertions, 7 deletions

diff --git a/src/main/java/org/bukkit/fillr/Fillr.java b/src/main/java/org/bukkit/fillr/Fillr.java
index 2bb068ca..185779c1 100644
--- a/src/main/java/org/bukkit/fillr/Fillr.java
+++ b/src/main/java/org/bukkit/fillr/Fillr.java
@@ -3,7 +3,6 @@ package org.bukkit.fillr;
 import org.bukkit.*;
 import org.bukkit.plugin.*;
 import org.bukkit.plugin.java.*;
-import org.bukkit.entity.Player;
 import org.bukkit.event.*;
 
 import java.io.File;
@@ -31,8 +30,4 @@ public class Fillr extends JavaPlugin {
         listener = new FillrListener(getServer());
         getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, listener, Event.Priority.Normal, this);
     }
-
-    public void onCommand(Player player, String command, String[] args) {
-        // TODO Auto-generated method stub
-    }
 }
diff --git a/src/main/java/org/bukkit/plugin/CommandParserYaml.java b/src/main/java/org/bukkit/plugin/CommandParserYaml.java
index 614b205a..50784ba1 100644
--- a/src/main/java/org/bukkit/plugin/CommandParserYaml.java
+++ b/src/main/java/org/bukkit/plugin/CommandParserYaml.java
@@ -16,8 +16,16 @@ public class CommandParserYaml {
         
         if (map != null) {
             for(Entry<String, Map<String, Object>> entry : map.entrySet()) {
-                String description = entry.getValue().get("description").toString();
-                String usageText = entry.getValue().get("usage").toString();
+                Object d = entry.getValue().get("description");
+                Object u = entry.getValue().get("usage");
+                String description = "";
+                String usageText = "";
+                
+                if (d != null)
+                    description = d.toString();
+                
+                if (u != null)
+                    usageText = u.toString();
     
                 cmds.add(new Command(entry.getKey(), description, usageText, plugin));
             }