Merge 2a006dc into 15be798

openwisp · Feb 18, 2015 · b7a3aa1 · b7a3aa1
2 parents 15be798 + 2a006dc
commit b7a3aa1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/rest_framework_gis/serializers.py b/rest_framework_gis/serializers.py
@@ -96,7 +96,9 @@ def to_representation(self, instance):
             field_name = field.field_name
             if field.read_only and instance is None:
                 continue
-            value = field.to_representation(field.get_attribute(instance))
+            value = field.get_attribute(instance)
+            if value:
+                value = field.to_representation(value)
             if self.Meta.id_field is not False and field_name == self.Meta.id_field:
                 ret["id"] = value
             elif field_name == self.Meta.geo_field: