diff --git a/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
index 679b75a1..f27bec3a 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
@@ -205,6 +205,8 @@ public class FlagWatcher {
     protected void sendData(int data) {
         if (disguise.getWatcher() == null || DisguiseAPI.getDisguise(disguise.getEntity()) != disguise)
             return;
+        if (!entityValues.containsKey(data) || entityValues.get(data) == null)
+            return;
         Entity entity = disguise.getEntity();
         Object value = entityValues.get(data);
         List<WatchableObject> list = new ArrayList<WatchableObject>();