Get rid of bare "except:" calls (a few more)