KRACOEUS-7253 : Fixing NPE