update the fix with improved catch block for issue - CARBON-14947
Merge pull request #67 from Nipuni/CARBON-14947

update the fix with improved catch block for issue - CARBON-14947