diff --git a/Lib/ldif.py b/Lib/ldif.py
index 69ebcbf..238f097 100644
--- a/Lib/ldif.py
+++ b/Lib/ldif.py
@@ -3,7 +3,7 @@
 
 See http://www.python-ldap.org/ for details.
 
-$Id: ldif.py,v 1.95 2016/07/17 17:43:04 stroeder Exp $
+$Id: ldif.py,v 1.96 2016/07/17 19:30:44 stroeder Exp $
 
 Python compability note:
 Tested with Python 2.0+, but should work with Python 1.5.2+.
@@ -497,7 +497,10 @@ def parse_change_records(self):
           # we now have the attribute name to be modified
           modattr = v
           modvalues = []
-          k,v = next_key_and_value()
+          try:
+            k,v = next_key_and_value()
+          except EOFError:
+            k,v = None,None
           while k==modattr:
             modvalues.append(v)
             k,v = next_key_and_value()