Added Email and some Exception Handling