Python no longer encourages the bare except: handler syntax. This

change adds generic exception types to the few instances where we still

did that.

Ran unit tests.