Email Service and Error Handling was added.