KRACOEUS-7175: Fixing null pointer