Revised error reporting