diff --git a/gettor/parse/email.py b/gettor/parse/email.py
index 5a3e45eec6b3c41b09d07507c336216836858ff8..d37614d807e9054774dc56e2237d1e77bfeb2739 100644
--- a/gettor/parse/email.py
+++ b/gettor/parse/email.py
@@ -84,6 +84,11 @@ class EmailParser(object):
                 "Email address normalized and validated.",
                 system="email parser"
             )
+
+            # Add a check for auto-generated mail-daemon emails
+            if "mailer-daemon@" in norm_addr.lower():
+                raise AddressError("Received mail from Mail Delivery System {}"
+                        .format(msg['From']))
             return True
 
         else:
@@ -206,7 +211,8 @@ class EmailParser(object):
         try:
             self.validate(norm_addr, msg)
         except AddressError as e:
-            log.message("Address error: {}".format(e.args))
+            log.msg("Address error: {}".format(e.args))
+            return {}
 
         hid = hashlib.sha256(norm_addr.encode('utf-8'))
         log.msg(
diff --git a/tests/test_email_service.py b/tests/test_email_service.py
index 3803e791568a708de1e2d72cab0a2c1367f9f74b..a41669f63b3b92c878de80a3a22b5b8207c1ff0c 100644
--- a/tests/test_email_service.py
+++ b/tests/test_email_service.py
@@ -289,6 +289,13 @@ class EmailServiceTests(unittest.TestCase):
                 ">\n")
         self.assertEqual(request["command"], "help")
 
+    def test_bounce(self):
+        ep = conftests.EmailParser(self.settings, "gettor@torproject.org")
+        request = ep.parse("From: MAILER-DAEMON@mx1.riseup.net\n"
+                "Subject: Undelivered Mail Returned to Sender\r\n"
+                "To: gettor@torproject.org\n osx en\n")
+
+        self.assertEqual(request, {})
 
 if __name__ == "__main__":
     unittest.main()