From da9daa700270f56323cb9a15da753efc7f833d32 Mon Sep 17 00:00:00 2001
From: Matt Bartolome <mbartolome@sdcwa.org>
Date: Wed, 18 Feb 2015 08:39:31 -0800
Subject: [PATCH] fix KeyError

---
 rest_framework/fields.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index b7133f1fc..48fed3a49 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1051,10 +1051,12 @@ class MultipleChoiceField(ChoiceField):
         ])
 
     def to_representation(self, value):
-        return set([
-            self.choice_strings_to_values[six.text_type(item)] for item in value
-        ])
-
+        if value in ('', None):
+            return value
+        try:
+            return self.choice_strings_to_values[six.text_type(value)]
+        except KeyError:
+            return value
 
 # File types...