Ticket #3849: onetoonefield-edit_inline-related.patch

django/db/models/fields/related.py

@@ -126 +126 @@
             raise AttributeError, "%s must be accessed via instance" % self.related.opts.object_name
 
         params = {'%s__pk' % self.related.field.name: instance._get_pk_val()}
-        rel_obj = self.related.model._default_manager.get(**params)
-        return rel_obj
+        try:
+            rel_obj = self.related.model._default_manager.get(**params)
+            return rel_obj
+        except self.related.model.DoesNotExist:
+            rel_obj = self.related.model._default_manager.none()
+            return rel_obj
 
     def __set__(self, instance, value):
         if instance is None: