Improve error messages a bit