Catch only certain errors to prevent swallowed errors
Bump
Merge remote-tracking branch 'origin/master'