1 files changed, 3 insertions, 3 deletions
diff --git a/push.py b/push.py
index 9b8d40c..b5af9ee 100755
--- a/push.py
+++ b/push.py
@@ -78,7 +78,7 @@ mail = parser.parse(sys.stdin)
 title, encoding = email.header.decode_header(mail.get('subject'))[0]
 try:
   title = title.decode(encoding).encode('utf-8')
-except NameError, TypeError:
+except (NameError, TypeError):
   pass
 
 # Lets at least try to handle mime multipart
@@ -97,10 +97,10 @@ else:
   payload = mail.get_payload(decode=True)
 
 # Recode payload to utf-8 if possible
-encoding = payload.get_charsets()[0]
 try:
+  encoding = payload.get_charsets()[0]
   payload = payload.decode(encoding).encode('utf-8')
-except NameError, TypeError:
+except (NameError, TypeError, AttributeError):
   pass
 
 msg = payload.strip()