Updated error reporting