Added error_report
Merge remote-tracking branch 'hscommon/master' into hscommon