RTGOV-281 Fix npe that prevents activity unit from being recorded