for common error cases still write out an error
Merge branch 'master' into hs_staging