Merge jn/maint-http-error-message