diff --git a/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java b/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java
index 492a1708..1751893e 100644
--- a/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java
+++ b/bukkit/src/main/java/co/aikar/commands/ACFBukkitUtil.java
@@ -318,9 +318,13 @@ public class ACFBukkitUtil {
         }
     }
 
+    @Deprecated
+    public static boolean isValidName(String name) {
+        return isValidName(name, null);
+    }
 
     public static boolean isValidName(String name, CommandManager manager) {
-        return name != null && !name.isEmpty() && (manager.isAllowInvalidName() || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
+        return name != null && !name.isEmpty() && ((manager != null && manager.isAllowInvalidName()) || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
     }
 
     static boolean isValidItem(ItemStack item) {
diff --git a/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java b/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java
index df1e4ea7..d1fc38eb 100644
--- a/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java
+++ b/bungee/src/main/java/co/aikar/commands/ACFBungeeUtil.java
@@ -149,8 +149,13 @@ public class ACFBungeeUtil {
         throw new IllegalStateException("You may not use the ACFBungeeUtil#findPlayerSmart(CommandSender) async to the command execution.");
     }
 
+    @Deprecated
+    public static boolean isValidName(String name) {
+        return isValidName(name, null);
+    }
+
     public static boolean isValidName(String name, CommandManager manager) {
-        return name != null && !name.isEmpty() && (manager.isAllowInvalidName() || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
+        return name != null && !name.isEmpty() && ((manager != null && manager.isAllowInvalidName()) || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
     }
 
     public static <T> T validate(T object, String message, Object... values) {
@@ -159,6 +164,4 @@ public class ACFBungeeUtil {
         }
         return object;
     }
-
-
 }
diff --git a/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java b/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java
index 0cc70b9e..a5b2915f 100644
--- a/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java
+++ b/sponge/src/main/java/co/aikar/commands/ACFSpongeUtil.java
@@ -89,8 +89,12 @@ public class ACFSpongeUtil {
         return matchedPlayers;
     }
 
-    public static boolean isValidName(String name, CommandManager manager) {
-        return name != null && !name.isEmpty() && (manager.isAllowInvalidName() || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
+    @Deprecated
+    public static boolean isValidName(String name) {
+        return isValidName(name, null);
     }
 
+    public static boolean isValidName(String name, CommandManager manager) {
+        return name != null && !name.isEmpty() && ((manager != null && manager.isAllowInvalidName()) || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
+    }
 }
diff --git a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
index 5abd1377..073190c1 100644
--- a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
+++ b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
@@ -64,8 +64,13 @@ public class ACFVelocityUtil {
                 .collect(Collectors.toList());
     }
 
+    @Deprecated
+    public static boolean isValidName(String name) {
+        return isValidName(name, null);
+    }
+
     public static boolean isValidName(String name, CommandManager manager) {
-        return name != null && !name.isEmpty() && (manager.isAllowInvalidName() || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
+        return name != null && !name.isEmpty() && ((manager != null && manager.isAllowInvalidName()) || ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches());
     }
 
     public static <T> T validate(T object, String message, Object... values) {