Merge branch 'zj/upstream-error-message'