diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index f8defece530..0fb4fdfcbf2 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -647,7 +647,7 @@ class orm_template(object):
             if not fun(self, cr, uid, ids):
                 translated_msg = trans._get_source(cr, uid, self._name, 'constraint', lng, source=msg) or msg
                 error_msgs.append(
-                        _("Error occur when validation the fields %s: %s") % (','.join(fields), translated_msg)
+                        _("Error occured while validating the field(s) %s: %s") % (','.join(fields), translated_msg)
                 )
         if error_msgs:
             cr.rollback()
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 0034a1e0bce..f29f1731ddb 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -327,7 +327,7 @@ def reverse_enumerate(l):
 #----------------------------------------------------------
 # Emails
 #----------------------------------------------------------
-def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, on_error=False, reply_to=False, tinycrm=False):
+def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, on_error=False, reply_to=False, tinycrm=False, ssl=False, debug=False):
     """Send an email."""
     if not email_cc:
         email_cc=[]