Improve our exception handling