Merge remote-tracking branch 'origin/master'

2014-06-27 09:10:40 +01:00
parent cd63865d31 76b2f25d46
commit 51b197888c
2 changed files with 2 additions and 2 deletions
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -332,7 +332,7 @@ class BaseDocument(object):
            pk = "None"
            if hasattr(self, 'pk'):
                pk = self.pk
-            elif self._instance:
+            elif self._instance and hasattr(self._instance, 'pk'):
                pk = self._instance.pk
            message = "ValidationError (%s:%s) " % (self._class_name, pk)
            raise ValidationError(message, errors=errors)