diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
index 41f10c3b..3af95dfa 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
@@ -163,7 +163,7 @@ public class FlagWatcher {
     }
 
     protected void sendData(int data) {
-        if (disguise.getWatcher() == null || !DisguiseAPI.isDisguised(disguise.getEntity()))
+        if (disguise.getWatcher() == null || disguise.getEntity() == null || !DisguiseAPI.isDisguised(disguise.getEntity()))
             return;
         Entity entity = disguise.getEntity();
         Object value = entityValues.get(data);