diff --git a/eav/models.py b/eav/models.py
index 3321616..4a441d5 100644
--- a/eav/models.py
+++ b/eav/models.py
@@ -529,7 +529,8 @@ class Entity(object):
             if self._hasattr(attribute.slug):
                 attribute_value = self._getattr(attribute.slug)
                 if attribute.datatype == Attribute.TYPE_ENUM and not isinstance(attribute_value, EnumValue):
-                    attribute_value = EnumValue.objects.get(value=attribute_value)
+                    if attribute_value is not None: 
+                        attribute_value = EnumValue.objects.get(value=attribute_value)
                 attribute.save_value(self.instance, attribute_value)
 
     def validate_attributes(self):