Avoid unnecessary catching of Exception instead of StandardError (conver...

...ting Exceptions into StandardErrors)

Very similar to https://github.com/rails/rails/commit/c9891608aa1e5ebbab04afe73bf7a28748001804, but I limited the scope to places where Exception was rescued and then re-raised as a StandardError.