Index: /main/waeup.sirp/branches/ulif-fasttables/src/waeup/sirp/utils/converters.py
===================================================================
--- /main/waeup.sirp/branches/ulif-fasttables/src/waeup/sirp/utils/converters.py	(revision 5316)
+++ /main/waeup.sirp/branches/ulif-fasttables/src/waeup/sirp/utils/converters.py	(revision 5317)
@@ -134,8 +134,22 @@
     def _convertValueFromString(self, string):
         if self.tokens is not None:
-            return self.tokens[string]
+            result = None
+            try:
+                result = self.tokens[string]
+            except KeyError:
+                # Be gentle...
+                try:
+                    result = self.tokens[string.lower()]
+                    return result
+                except KeyError:
+                    tokenlist = (','.join(self.tokens[:2]))
+                    raise ValueError(
+                        'The token %s is not valid. Use one of %s, ...' % (
+                            string, tokenlist))
+            return result
         if self.terms is not None:
             return self.terms.getValue(string)
-        return self.context.source.getTermByToken(string).value
+        result = self.context.source.getTermByToken(string).value
+        return result
 
     def _convertValueToString(self, value):
