KRACOEUS-7940

- Updated code to fix exception