Merge branch 'jc/error-message-in-cherry-pick'