Validation for choice fields.

Fix for https://code.djangoproject.com/ticket/20749