Merge pull request #553 from maspwr/null-one-to-one

Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-one

1 files changed, 8 insertions, 2 deletions

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index adc47800..5e4552b7 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -101,7 +101,10 @@ class RelatedField(WritableField):
     ### Regular serializer stuff...
 
     def field_to_native(self, obj, field_name):
-        value = getattr(obj, self.source or field_name)
+        try:
+            value = getattr(obj, self.source or field_name)
+        except ObjectDoesNotExist:
+            return None
         return self.to_native(value)
 
     def field_from_native(self, data, files, field_name, into):
@@ -211,7 +214,10 @@ class PrimaryKeyRelatedField(RelatedField):
             pk = obj.serializable_value(self.source or field_name)
         except AttributeError:
             # RelatedObject (reverse relationship)
-            obj = getattr(obj, self.source or field_name)
+            try:
+                obj = getattr(obj, self.source or field_name)
+            except ObjectDoesNotExist:
+                return None
             return self.to_native(obj.pk)
         # Forward relationship
         return self.to_native(pk)