Index: /main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py	(revision 7837)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py	(revision 7838)
@@ -37,17 +37,27 @@
     )
 
-class SemesterSource(BasicContextualSourceFactory):
+class SemesterSource(BasicSourceFactory):
     """An institution type source delivers semester or term descriptors.
     """
-    def getValues(self, context):
-        semesters_dict = getUtility(IKofaUtils).getSemesterDict()
-        return semesters_dict.keys()
-
-    def getToken(self, context, value):
+    def getValues(self):
+        try:
+            # We have to 'try', don't know why (henrik)
+            # Alternatively, we can use BasicContextualSourceFactory,
+            # see sources below
+            from waeup.kofa.interfaces import IKofaUtils
+            return getUtility(IKofaUtils).getSemesterDict().keys()
+        except:
+            return [9]
+        
+    def getToken(self, value):
         return str(value)
 
-    def getTitle(self, context, value):
-        semesters_dict = getUtility(IKofaUtils).getSemesterDict()
-        return semesters_dict[value]
+    def getTitle(self, value):
+        try:
+            from waeup.kofa.interfaces import IKofaUtils
+            semesters_dict = getUtility(IKofaUtils).getSemesterDict()
+            return semesters_dict[value]
+        except:
+            value
 
 class InstTypeSource(BasicContextualSourceFactory):
