KRACOEUS-7728: Fixing null pointer in unit lookups everywhere.
Merge pull request #544 from gathreya/unitLookup

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