More descriptive error messages in two places.