diff --git a/django/core/formfields.py b/django/core/formfields.py index 3289be5235..167439cc07 100644 --- a/django/core/formfields.py +++ b/django/core/formfields.py @@ -875,7 +875,10 @@ class USStateField(TextField): raise validators.CriticalValidationError, e.messages def html2python(data): - return data.upper() # Should always be stored in upper case + if data: + return data.upper() # Should always be stored in upper case + else: + return None html2python = staticmethod(html2python) class CommaSeparatedIntegerField(TextField):