Added More Exception Handler

Added More Exception Handler