more changes for error reporting