Refactored methods with incorrect exception handling-CARBON-14992 - heshaniot

Refactored methods with incorrect exception handling-CARBON-14992 - heshaniot