Fixed some issues in redundant catch issue.