Fix typo
Improve error messages.