Merge "Add a few more pending exception checks"