Improve error messages (minor)