Added Email and error handling