Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 7206)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 7207)
@@ -24,5 +24,5 @@
 from zope.interface import implementedBy
 from waeup.sirp.university.interfaces import (
-    ICertificate, ICertificateAdd, ICertificateCourse, ICourse)
+    ICertificate, ICertificateAdd, ICertificateCourse)
 from waeup.sirp.university.vocabularies import course_levels    
 
@@ -113,24 +113,2 @@
     def getInterfaces(self):
         return implementedBy(CertificateCourse)
-
-@grok.subscribe(ICourse, grok.IObjectRemovedEvent)
-def handle_course_removed(course, event):
-    """If a course is deleted, we make sure that also referrers in a
-       certificatecontainer are removed.
-    """
-    code = course.code
-
-    # Find all certificatecourses that refer to given course...
-    try:
-        cat = getUtility(ICatalog, name='certcourses_catalog')
-    except ComponentLookupError:
-        # catalog not available. This might happen during tests.
-        return
-        
-    results = cat.searchResults(course_code=(code, code))
-    for certcourse in results:
-        # Remove that referrer...
-        cert = certcourse.__parent__
-        cert.delCourseRef(code)
-        cert._p_changed = True
-    return
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/course.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/course.py	(revision 7206)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/course.py	(revision 7207)
@@ -19,6 +19,8 @@
 """
 import grok
+from zope.catalog.interfaces import ICatalog
 from zope.interface import implementedBy
-from zope.component.interfaces import IFactory
+from zope.component import getUtility
+from zope.component.interfaces import IFactory, ComponentLookupError
 from waeup.sirp.university.interfaces import ICourse, ICourseAdd
 
@@ -57,2 +59,24 @@
     def getInterfaces(self):
         return implementedBy(Course)
+
+@grok.subscribe(ICourse, grok.IObjectRemovedEvent)
+def handle_course_removed(course, event):
+    """If a course is deleted, we make sure that also referrers in a
+       certificatecontainer are removed.
+    """
+    code = course.code
+
+    # Find all certificatecourses that refer to given course...
+    try:
+        cat = getUtility(ICatalog, name='certcourses_catalog')
+    except ComponentLookupError:
+        # catalog not available. This might happen during tests.
+        return
+
+    results = cat.searchResults(course_code=(code, code))
+    for certcourse in results:
+        # Remove that referrer...
+        cert = certcourse.__parent__
+        cert.delCourseRef(code)
+        cert._p_changed = True
+    return
