fixed more null cmh errors in ongoingmode