KRACOEUS-8246: null pointer fix
Merge pull request #1187 from gathreya/moreHierarchy-8246

KRACOEUS-8246: null pointer fix