KRACOEUS-8418: Fixing null pointers