KRACOEUS-8391: fixing NPE