Replace bare excepts

This will fix http://trac.buildbot.net/ticket/2540.
Hah, and "Bulidbot".. in my defense I was on a plane and it was hard to see :)