Index: django/db/models/query.py
===================================================================
--- django/db/models/query.py	(revision 7818)
+++ django/db/models/query.py	(working copy)
@@ -316,7 +316,10 @@
                 obj.save()
                 return obj, True
             except IntegrityError, e:
-                return self.get(**kwargs), False
+                try:
+                    return self.get(**kwargs), False
+                except self.model.DoesNotExist, e2:
+                    raise e
 
     def latest(self, field_name=None):
         """