diff --git a/litecommands-bukkit/src/dev/rollczi/litecommands/bukkit/argument/OfflinePlayerArgument.java b/litecommands-bukkit/src/dev/rollczi/litecommands/bukkit/argument/OfflinePlayerArgument.java
index 569b49888..ad91dd64e 100644
--- a/litecommands-bukkit/src/dev/rollczi/litecommands/bukkit/argument/OfflinePlayerArgument.java
+++ b/litecommands-bukkit/src/dev/rollczi/litecommands/bukkit/argument/OfflinePlayerArgument.java
@@ -35,7 +35,11 @@ public OfflinePlayerArgument(Server server, Plugin plugin, boolean enableThreadC
 
         // Server#getOfflinePlayers() can be blocking, so we don't want to call it every time
         for (OfflinePlayer offlinePlayer : server.getOfflinePlayers()) {
-            this.nicknames.add(offlinePlayer.getName());
+            String name = offlinePlayer.getName();
+
+            if (name != null) {
+                this.nicknames.add(name);
+            }
         }
 
         // Save new joining player names so our suggestions are more wide