Improve error-reporting a bit