More descriptive error messages.
Fix error messages.