More calls to trouble changed to report_error