Catch more errors.