Change to clearly hook in errors.