Improve intance checking for catches