rescue from the occasional URI::InvalidURIError and force a reauthentication
Merge remote-tracking branch 'origin/master'