Refine catch blocks