diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index ef2200045f..c072364bcf 100644
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -233,13 +233,16 @@ class EmailAccount(Document):
 
 			try:
 				parent.insert(ignore_permissions=True)
-			except frappe.DuplicateEntryError:
-				# try and find matching parent
-				parent_name = frappe.db.get_value(self.append_to, {sender_field: email.from_email})
-				if parent_name:
-					parent.name = parent_name
+			except frappe.NameError, e:
+				if e.args and e.args[0]==self.append_to:
+					# try and find matching parent
+					parent_name = frappe.db.get_value(self.append_to, {sender_field: email.from_email})
+					if parent_name:
+						parent.name = parent_name
+					else:
+						parent = None
 				else:
-					parent = None
+					raise
 
 			communication.is_first = True