KRACOEUS-7994 fixed NPEs