diff --git a/zerver/lib/email_mirror.py b/zerver/lib/email_mirror.py
index 0a38f187e4..9b2954b1af 100644
--- a/zerver/lib/email_mirror.py
+++ b/zerver/lib/email_mirror.py
@@ -166,7 +166,7 @@ def extract_and_upload_attachments(message):
 def extract_and_validate(email):
     try:
         stream_name, token = decode_email_address(email)
-    except TypeError:
+    except (TypeError, ValueError):
         raise ZulipEmailForwardError("Malformed email recipient " + email)
 
     if not valid_stream(stream_name, token):