Code style changes.

Consistent parens on function calls, catch the exception we actually want.