diff --git a/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java b/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java
index 03fc299a..9b1e119b 100644
--- a/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java
+++ b/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java
@@ -268,12 +268,6 @@ public class ACFBukkitUtil {
             return null;
         }
         String name = ACFUtil.replace(search, ":confirm", "");
-
-        if (!isValidName(name)) {
-            issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
-            return null;
-        }
-
         List<Player> matches = Bukkit.getServer().matchPlayer(name);
         List<Player> confirmList = new ArrayList<>();
         findMatches(search, requester, matches, confirmList);
@@ -288,6 +282,10 @@ public class ACFBukkitUtil {
 
         //noinspection Duplicates
         if (matches.isEmpty()) {
+            if (!isValidName(name)) {
+                issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
+                return null;
+            }
             Player player = ACFUtil.getFirstElement(confirmList);
             if (player == null) {
                 issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER, "{search}", name);
diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java
index 05a5b157..e984f3c9 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java
@@ -142,12 +142,12 @@ public class BukkitCommandContexts extends CommandContexts<BukkitCommandExecutio
                 }
                 offlinePlayer = Bukkit.getOfflinePlayer(uuid);
             } else {
-                if (!isValidName(name)) {
-                    throw new InvalidCommandArgument(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
-                }
                 offlinePlayer = Bukkit.getOfflinePlayer(name);
             }
             if (offlinePlayer == null || (!offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline())) {
+                if (!c.hasFlag("uuid") && !isValidName(name)) {
+                    throw new InvalidCommandArgument(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
+                }
                 throw new InvalidCommandArgument(MinecraftMessageKeys.NO_PLAYER_FOUND_OFFLINE,
                         "{search}", name);
             }
diff --git a/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java b/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java
index 2a1a7fe3..c315a615 100644
--- a/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java
+++ b/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java
@@ -113,10 +113,6 @@ public class ACFBungeeUtil {
     public static ProxiedPlayer findPlayerSmart(CommandIssuer issuer, String search) {
         CommandSender requester = issuer.getIssuer();
         String name = ACFUtil.replace(search, ":confirm", "");
-        if (!isValidName(name)) {
-            issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
-            return null;
-        }
 
         List<ProxiedPlayer> matches = new ArrayList<>(ProxyServer.getInstance().matchPlayer(name));
 
@@ -128,6 +124,10 @@ public class ACFBungeeUtil {
         }
 
         if (matches.isEmpty()) {
+            if (!isValidName(name)) {
+                issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
+                return null;
+            }
             issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER,
                     "{search}", name);
             return null;
diff --git a/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java b/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java
index 9ea8903b..44ce0876 100644
--- a/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java
+++ b/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java
@@ -17,10 +17,6 @@ public class ACFSpongeUtil {
             return null;
         }
         String name = ACFUtil.replace(search, ":confirm", "");
-        if (!isValidName(name)) {
-            issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
-            return null;
-        }
 
         List<Player> matches = matchPlayer(name);
         List<Player> confirmList = new ArrayList<>();
@@ -35,6 +31,10 @@ public class ACFSpongeUtil {
         }
 
         if (matches.isEmpty()) {
+            if (!isValidName(name)) {
+                issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
+                return null;
+            }
             Player player = ACFUtil.getFirstElement(confirmList);
             if (player == null) {
                 issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER, "{search}", name);
diff --git a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
index 6dab2e18..aa067b45 100644
--- a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
+++ b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
@@ -22,10 +22,6 @@ public class ACFVelocityUtil {
     public static Player findPlayerSmart(ProxyServer server, CommandIssuer issuer, String search) {
         CommandSource requester = issuer.getIssuer();
         String name = ACFUtil.replace(search, ":confirm", "");
-        if (!isValidName(name)) {
-            issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
-            return null;
-        }
 
         List<Player> matches = new ArrayList<>(matchPlayer(server, name));
 
@@ -36,6 +32,10 @@ public class ACFVelocityUtil {
         }
 
         if (matches.isEmpty()) {
+            if (!isValidName(name)) {
+                issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
+                return null;
+            }
             issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER, "{search}", name);
             return null;
         }