Merge branch 'cc/fetch-error-message-fix'