Modified error reporting