KRACOEUS-8418: Fixing null pointers
Merge pull request #1178 from gathreya/nullPointer-KRACOEUS-8418

KRACOEUS-8418: Fixing null pointers