Merge "Ignore catch blocks whose type can't be resolved."