Additional modifications to error reporting