diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index 846207ac3..5090c39a8 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -742,7 +742,7 @@ public class NPCCommands {
         }
 
         OfflinePlayer player = Bukkit.getOfflinePlayer(name);
-        if (player == null) {
+        if (!player.hasPlayedBefore()) {
             NPCCommandSelector.Callback callback = new NPCCommandSelector.Callback() {
                 @Override
                 public void run(NPC followingNPC) throws CommandException {
@@ -1465,7 +1465,7 @@ public class NPCCommands {
         UUID uuid;
         if (args.getString(1).equalsIgnoreCase("SERVER")) {
             uuid = null;
-        } else if ((p = Bukkit.getOfflinePlayer(args.getString(1))) != null) {
+        } else if ((p = Bukkit.getOfflinePlayer(args.getString(1))).hasPlayedBefore()) {
             uuid = p.getUniqueId();
         } else {
             uuid = UUID.fromString(args.getString(1));