Merge "Make sure we always restore the error handler."