Merge branch 'fixes/2013' of git://github.com/gregmuellegger/django-rest-framework into gregmuellegger-fixes/2013

1 files changed, 13 insertions, 1 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index a4140c0f..143d205d 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -35,6 +35,7 @@ from rest_framework.validators import (
 )
 import copy
 import inspect
+import sys
 import warnings
 
 # Note: We do the following so that users of the framework can use this style:
@@ -653,7 +654,18 @@ class ModelSerializer(Serializer):
             if relation_info.to_many and (field_name in validated_attrs):
                 many_to_many[field_name] = validated_attrs.pop(field_name)
 
-        instance = ModelClass.objects.create(**validated_attrs)
+        try:
+            instance = ModelClass.objects.create(**validated_attrs)
+        except TypeError as exc:
+            msg = (
+                'The mentioned argument might be a field on the serializer '
+                'that is not part of the model. You need to override the '
+                'create() method in your ModelSerializer subclass to support '
+                'this.')
+            six.reraise(
+                type(exc),
+                type(exc)(str(exc) + '. ' + msg),
+                sys.exc_info()[2])
 
         # Save many-to-many relationships after the instance is created.
         if many_to_many: