refactoring: findbugs cleanup

* don't catch raw exceptions