If an entity is null/non-existant then stop checking watchers completely
Fix array index out of bounds exception