diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
index 6ef151658..aa5999ce6 100644
--- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
+++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
@@ -437,6 +437,8 @@ public class ScriptPlayerEventHandler {
             if (quest != null) {
                 NoppesUtilPlayer.sendTrackedQuestData((EntityPlayerMP) event.player, quest);
             }
+
+            PlayerDataController.instance.getPlayerData(event.player).skinOverlays.updateClient();
         }
     }
 
diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java
index 9362f3e7c..0588efb08 100644
--- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java
+++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java
@@ -286,7 +286,9 @@ public class PacketHandlerClient extends PacketHandlerServer{
 		else if(type == EnumPacketClient.PLAYER_UPDATE_SKIN_OVERLAYS) {
 			EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(Server.readString(buffer));
 			NBTTagCompound compound = Server.readNBT(buffer);
-			NoppesUtil.updateSkinOverlayData(sendingPlayer, compound);
+			if (sendingPlayer != null) {
+				NoppesUtil.updateSkinOverlayData(sendingPlayer, compound);
+			}
 		}
 		else if(type == EnumPacketClient.DISABLE_MOUSE_INPUT) {
 			long length = buffer.readLong();