diff --git a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
index ff573d2d..b0f67a78 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -632,6 +632,10 @@ public abstract class Disguise {
     }
 
     public void setWatcher(FlagWatcher newWatcher) {
+        if (!getType().getWatcherClass().isInstance(newWatcher)) {
+            throw new IllegalArgumentException(newWatcher.getClass().getSimpleName() + " is not a instance of "
+                    + getType().getWatcherClass().getSimpleName() + " for DisguiseType " + getType().name());
+        }
         watcher = newWatcher;
     }
 }
\ No newline at end of file