diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java
index afd26a4..79c5c6c 100644
--- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java
+++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java
@@ -188,10 +188,6 @@ public class AICommand extends CommandInstance implements AIManager {
 
     @Autofill
     public List<String> infoAutofill(CommandSender sender, String[] args) {
-        if (args.length == 2) {
-            return manager.fetchNames();
-        } else {
-            return null;
-        }
+    	return args.length == 2 ? manager.fetchNames() : new ArrayList<>();
     }
 }
diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java
index f0cf3c8..2b8e01a 100644
--- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java
+++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java
@@ -223,7 +223,7 @@ public class BotCommand extends CommandInstance {
 
     @Autofill
     public List<String> armorAutofill(CommandSender sender, String[] args) {
-        return args.length == 2 ? new ArrayList<>(armorTiers.keySet()) : null;
+        return args.length == 2 ? new ArrayList<>(armorTiers.keySet()) : new ArrayList<>();
     }
 
     @Command(
@@ -280,7 +280,7 @@ public class BotCommand extends CommandInstance {
 
     @Autofill
     public List<String> infoAutofill(CommandSender sender, String[] args) {
-        return args.length == 2 ? manager.fetchNames() : null;
+        return args.length == 2 ? manager.fetchNames() : new ArrayList<>();
     }
 
     @Command(