Merge pull request #707 from public/consume-errors

Get rid of handle_errors