Clean up try/catch blocks / Prefer 'throw' to 'fireExceptionCaught'