Added email field and exception