Moving error handling for reporting modes to right place