Merge branch 'catch-html-parse-error'