Fix lots of blind exception handling

Also found one instance of redundant brackets