KRACOEUS-7250_1

-Updated code to fix exception