Improve error reporting (again)