Prevent crash when inconsistant data is put on choice property model

1 files changed, 2 insertions, 2 deletions

diff --git a/chimere/models.py b/chimere/models.py
index e7a0f8f..9a91a74 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -1619,7 +1619,7 @@ class Property(models.Model):
             try:
                 return unicode(PropertyModelChoice.objects.get(
                                                     pk=self.value).value)
-            except self.DoesNotExist:
+            except (self.DoesNotExist, ValueError):
                 return ""
         return unicode(self.value)
 
@@ -1636,7 +1636,7 @@ class Property(models.Model):
         if self.propertymodel.type == 'C' and self.value:
             try:
                 return PropertyModelChoice.objects.get(pk=self.value)
-            except self.DoesNotExist:
+            except (self.DoesNotExist, ValueError):
                 return None
         else:
             return self.value