Ticket #7270: 12307-onetoone-null.patch

django/db/models/query.py

@@ -1202 +1202 @@
                 # If the base object exists, populate the
                 # descriptor cache
                 setattr(obj, f.get_cache_name(), rel_obj)
-            if f.unique:
+            if f.unique and rel_obj is not None:
                 # If the field is unique, populate the
                 # reverse descriptor cache on the related object
                 setattr(rel_obj, f.related.get_cache_name(), obj)