Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py	(revision 17793)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py	(revision 17794)
@@ -540,17 +540,13 @@
             current_session=None, current_level=None, certcode=None,
             current_mode=None, faccode=None, depcode=None, p_session=None):
-        """Returns bursary data of a subset of students.
-        """
-        if not current_session:
-            current_session = None
-        if not current_level:
-            current_level = None
-        if not depcode:
-            depcode = None
-        if not certcode:
-            certcode = None
-        if not current_mode:
-            current_mode = None
+        """Returns base data of a subset of students.
+        """
         hitlist = []
+        try:
+            current_session = int(current_session)
+            current_level = int(current_level)
+        except (TypeError, ValueError):
+            hitlist.append(dict(error="Wrong parameters"))
+            return hitlist
         cat = queryUtility(ICatalog, name='students_catalog')
         results = cat.searchResults(
@@ -562,4 +558,7 @@
                 depcode=(depcode, depcode),
                 )
+        if len(results) > 500:
+            hitlist.append(dict(error="Too many objects (500 max)"))
+            return hitlist
         for student in results:
             hitlist.append(dict(
