Make error reporting consistent