KRACOEUS-7262- Fixing null pointer.