Merge pull request #1032 from yprez/writable-nested-modelserializer_fixes

Writable nested serializer - fix setting nested serializer to null

1 files changed, 3 insertions, 2 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index d8f9145e..2b260c25 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -522,7 +522,7 @@ class BaseSerializer(WritableField):
             if self.object._deleted:
                 [self.delete_object(item) for item in self.object._deleted]
         else:
-            self.save_object(self.object, **kwargs)        
+            self.save_object(self.object, **kwargs)
 
         return self.object
 
@@ -891,7 +891,8 @@ class ModelSerializer(Serializer):
             # Nested relationships need to be saved before we can save the
             # parent instance.
             for field_name, sub_object in obj._nested_forward_relations.items():
-                self.save_object(sub_object)
+                if sub_object:
+                    self.save_object(sub_object)
                 setattr(obj, field_name, sub_object)
 
         obj.save(**kwargs)