Improve error messages slightly