Refactored Exceptions
Refactored Exception handling
Merge remote-tracking branch 'origin/master'