diff --git a/plugins/EmailRegistration/emailregister.php b/plugins/EmailRegistration/emailregister.php index 53eb3778d9..8113111a6c 100644 --- a/plugins/EmailRegistration/emailregister.php +++ b/plugins/EmailRegistration/emailregister.php @@ -211,13 +211,18 @@ class EmailregisterAction extends Action $valid = false; - if (Event::handle('StartValidateUserEmail', array(null, $this->email, &$valid))) { - $valid = Validate::email($this->email, common_config('email', 'check_domain')); - Event::handle('EndValidateUserEmail', array(null, $this->email, &$valid)); - } - - if (!$valid) { - $this->error = _('Not a valid email address.'); + try { + if (Event::handle('StartValidateUserEmail', array(null, $this->email, &$valid))) { + $valid = Validate::email($this->email, common_config('email', 'check_domain')); + Event::handle('EndValidateUserEmail', array(null, $this->email, &$valid)); + } + if (!$valid) { + $this->error = _('Not a valid email address.'); + $this->showRegistrationForm(); + return; + } + } catch (ClientException $e) { + $this->error = $e->getMessage(); $this->showRegistrationForm(); return; }