Exception handling
Refactored the code
checkin
changes