KRACOEUS-7940

- Updated code to fix exception 
@SravanVed can you fix this please?