diff --git a/ChangeLog b/ChangeLog
index 38f284c78..f66f68df1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
   * Fix high cpu usage when displaying speeds in titlebar
   * Fix showing non-utf8 encoded torrents in add torrent dialog -- this adds
     an additional dependency on chardet.
+  * Fix exception when timing out trying to send notification email
 
 ==== WebUI ====
   * Fix starting when -l option is used
diff --git a/deluge/ui/gtkui/notification.py b/deluge/ui/gtkui/notification.py
index 34648c723..68f823480 100644
--- a/deluge/ui/gtkui/notification.py
+++ b/deluge/ui/gtkui/notification.py
@@ -115,7 +115,12 @@ class Notification:
             port = 587
         elif self.config["ntf_security"] == None:
             port = 25
-        mailServer = smtplib.SMTP(self.config["ntf_server"], port)
+        try:
+            mailServer = smtplib.SMTP(self.config["ntf_server"], port)
+        except Exception, e:
+            log.error("There was an error sending the notification email: %s", e)
+            return
+
         if self.config["ntf_username"] and self.config["ntf_pass"]:
             if self.config["ntf_security"] == 'SSL' or 'TLS':
                 mailServer.ehlo('x')