diff --git a/src/main/java/co/aikar/commands/RootCommand.java b/src/main/java/co/aikar/commands/RootCommand.java
index 4e935c29..007db4a3 100644
--- a/src/main/java/co/aikar/commands/RootCommand.java
+++ b/src/main/java/co/aikar/commands/RootCommand.java
@@ -68,12 +68,13 @@ public class RootCommand extends Command {
         if (!this.defCommand.testPermission(sender)) {
             return true;
         }
+
         this.defCommand.execute(sender, commandLabel, args);
         return false;
     }
 
     void addChild(BaseCommand command) {
-        if (this.defCommand == null || command.subCommands.get("__default") != null) {
+        if (this.defCommand == null || !command.subCommands.get("__default").isEmpty()) {
             this.defCommand = command;
             this.setDescription(command.getDescription());
             this.setUsage(command.getUsage());