[beam maintainance] better error handling