diff --git a/frappe/__init__.py b/frappe/__init__.py index 9721ed9b08..d4bade75a8 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -340,7 +340,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, message_log.append(json.dumps(out)) - if raise_exception: + if raise_exception and hasattr(raise_exception, '__name__'): local.response['exc_type'] = raise_exception.__name__ _raise_exception() diff --git a/frappe/email/queue.py b/frappe/email/queue.py index b671dc91d8..6b6b006670 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -80,7 +80,7 @@ def send(recipients=None, sender=None, subject=None, message=None, text_content= recipients = list(set(recipients)) cc = list(set(cc)) - all_ids = recipients + cc + all_ids = tuple(recipients + cc) unsubscribed = frappe.db.sql_list(''' SELECT