I've made an edit to the `except:` here: cb2984a

Details in the commit message, please revert if you disagree!