Merge branch 'jk/http-errors'