diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
index 7f52fa33..6cbae240 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
@@ -234,6 +234,8 @@ public class FlagWatcher {
         if (itemStack != null && itemStack.getTypeId() != 0)
             itemToSend = CraftItemStack.asNMSCopy(itemStack);
         items[slot] = itemStack;
+        if (disguise.getEntity() == null)
+            return;
         slot++;
         if (slot > 4)
             slot = 0;