Codereview - Refactored exception handling
Refactored Exception Handling