KRACOEUS-7725: fixing NPE