Improve error message a bit