diff --git a/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java b/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
index 1a4242a2..a9904cb8 100644
--- a/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
+++ b/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
@@ -27,6 +27,11 @@ public final class AllowedCharacters
 
     public static boolean isValidName(String name, boolean onlineMode)
     {
+        if ( name.isEmpty() || name.length() > 16 )
+        {
+            return false;
+        }
+
         for ( int index = 0, len = name.length(); index < len; index++ )
         {
             if ( !isNameAllowedCharacter( name.charAt( index ), onlineMode ) )