diff --git a/oscar/models/fields/__init__.py b/oscar/models/fields/__init__.py
index f27dc3104..b80bdaad5 100644
--- a/oscar/models/fields/__init__.py
+++ b/oscar/models/fields/__init__.py
@@ -115,7 +115,8 @@ def contribute_to_class(self, cls, name, **kwargs):
         super(NullCharField, self).contribute_to_class(cls, name, **kwargs)
         setattr(cls, self.name, Creator(self))
 
-    def from_db_value(self, value, expression, connection, context):
+    #def from_db_value(self, value, expression, connection, context):  # removed due to context error
+    def from_db_value(self, value, expression, connection):
         return self.to_python(value)
 
     def to_python(self, value):