RTGOV-219 NPE when cleanup of derived collection elements has been fixed