Replace bare excepts

This will fix http://trac.buildbot.net/ticket/2540.
/changed/  minor spelling, here and the other two copy-paste