be more explicit about which errors are rescued
Merge pull request #6948 from rolandwalker/explicit_rescue

be more explicit about which errors are rescued