Upstream changes

Automatically opened by http://forkbomb.io
Avoid using `rescue` in its modifier form.