KRACOEUS-7728: Fixing null pointer in unit lookups everywhere.