Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py	(revision 5991)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py	(revision 5992)
@@ -17,5 +17,7 @@
 from waeup.sirp.interfaces import IUniversity
 from waeup.sirp.catalog import QueryResultItem
-from waeup.sirp.university.interfaces import ICourse, ICertificateCourse
+from waeup.sirp.university.interfaces import (
+     ICourse, ICertificateCourse, IDepartment,
+     )
 
 class CourseIndexes(grok.Indexes):
@@ -57,4 +59,12 @@
      index.index_doc(intids.getId(obj), obj)
 
+@grok.subscribe(IDepartment, grok.IObjectRemovedEvent)
+def handleDepartmentRemoval(obj, event):
+     """Clear courses and certificates when a department is killed.
+     """
+     obj.courses.clear()
+     obj.certificates.clear()
+     return
+
 class CourseQueryResultItem(QueryResultItem):
      def __init__(self, context, view):
