Add patch from upstream pull request to remove is_error() macro