Adding "instanceof" checks to be catch any incorrect annotation usage