Merge branch 'jk/http-error-messages'