diff --git a/MinecraftClient/ChatBot.cs b/MinecraftClient/ChatBot.cs
index 64e9c8ba..0b6a62c4 100644
--- a/MinecraftClient/ChatBot.cs
+++ b/MinecraftClient/ChatBot.cs
@@ -204,7 +204,7 @@ namespace MinecraftClient
         /// Verify that a string contains only a-z A-Z 0-9 and _ characters.
         /// </summary>
 
-        protected static bool IsValidName(string username)
+        public static bool IsValidName(string username)
         {
             if (String.IsNullOrEmpty(username))
                 return false;
diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs
index fb26c08a..234bc579 100644
--- a/MinecraftClient/McTcpClient.cs
+++ b/MinecraftClient/McTcpClient.cs
@@ -563,8 +563,8 @@ namespace MinecraftClient
         /// <param name="info">Info about this player</param>
         public void OnPlayerJoin(PlayerInfo info)
         {
-            //Ignore TabListPlus placeholders
-            if (info.Name.StartsWith("0000tab#"))
+            //Ignore placeholders eg 0000tab# from TabListPlus
+            if (!ChatBot.IsValidName(info.Name))
                 return;
 
             lock (onlinePlayers)
diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs
index 888dc813..2c1ee364 100644
--- a/MinecraftClient/Protocol/Handlers/Protocol18.cs
+++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs
@@ -430,8 +430,8 @@ namespace MinecraftClient.Protocol.Handlers
                                     int propNum = readNextVarInt(packetData);
                                     for (int p = 0; p < propNum; p++)
                                     {
-                                        readNextString(packetData);
-                                        readNextString(packetData);
+                                        string key = readNextString(packetData);
+                                        string val = readNextString(packetData);
                                         if (readNextBool(packetData))
                                             readNextString(packetData);
                                     }