VE-1413 Addressing CR comments
VE-1413 modifying additional methods into using try finally