Add instanceof guard around boundary handling Otherwise there could be a class cast exception when the class was an annotation object