adding ExceptionHandling with changes for review comments #191

Please review #191