Index: /WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py	(revision 3253)
+++ /WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py	(revision 3254)
@@ -11,3 +11,3 @@
 if res:
     return [-1].Title
-return "unknown Faculty %s" % key
+raise KeyError
Index: /WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py	(revision 3253)
+++ /WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py	(revision 3254)
@@ -11,4 +11,5 @@
 if res:
     return res[-1].Title
-return "unknown Department %s" % key
 
+raise KeyError
+
Index: /WAeUP_SRP/base/skins/waeup_accommodation/reservedRoomsVoc.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_accommodation/reservedRoomsVoc.py	(revision 3253)
+++ /WAeUP_SRP/base/skins/waeup_accommodation/reservedRoomsVoc.py	(revision 3254)
@@ -15,2 +15,3 @@
     if k == key:
         return v
+raise KeyError
Index: /WAeUP_SRP/base/skins/waeup_default/getSessionsVoc.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_default/getSessionsVoc.py	(revision 3253)
+++ /WAeUP_SRP/base/skins/waeup_default/getSessionsVoc.py	(revision 3254)
@@ -15,7 +15,7 @@
     y = int(key)
 except:
-    return key
+    raise KeyError
 if y == -1:
-    return ''
+    raise KeyError
 if y < 90:
     cent = 2000
Index: /WAeUP_SRP/base/skins/waeup_student/getStudentLevelsVoc.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_student/getStudentLevelsVoc.py	(revision 3253)
+++ /WAeUP_SRP/base/skins/waeup_student/getStudentLevelsVoc.py	(revision 3254)
@@ -33,9 +33,12 @@
     ikey = int(key)
 else:
-    return ''
+    raise KeyError
 level_nr,repeat = divmod(ikey, 100)
 l = []
 
-level = context.portal_vocabularies.levels.get("%d00" % level_nr)
+level = context.portal_vocabularies.levels.get("%d00" % level_nr,None)
+if level is None:
+    raise KeyError
+    
 if level_nr > end_level/100:
     return "%s Spillover" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))
