Refactored methods with incorrect exception handling-CARBON-14992 - heshaniot
Merge pull request #54 from cnapagoda/release-4.3.0

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