Removed insane catch all exceptions block