fix gh-521 update-error-message
Merge remote-tracking branch 'origin/fix-gh-521-update-error-message-v2'