diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index ef9423aadf7..2b28b643048 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -196,12 +196,12 @@ def getaddrlist(self):
         Returns a list containing all of the addresses.
         """
         result = []
-        while True:
+        while self.pos < len(self.field):
             ad = self.getaddress()
             if ad:
                 result += ad
             else:
-                break
+                result.append(('', ''))
         return result
 
     def getaddress(self):