Update to check for undefined email