Is cPickle haunting us again?

pwman/util/crypto.py

@@ -404,7 +404,7 @@ password again")
             # TODO: completely remove this block, and convert
             # the DB to a completely plain text ...
             return cPickle.loads(plaintext)
-        except (TypeError, ValueError, cPickle.UnpicklingError):
+        except (TypeError, ValueError, cPickle.UnpicklingError, EOFError):
             return plaintext