Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 15428)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 15429)
@@ -329,4 +329,18 @@
                   'book fee have been paid.'
                   % course.code))
+        # We check if there exists a certificate course in the certificate
+        # container which refers to the course. If such an object does
+        # not exist, students and managers will be prevented from registering
+        # the corresponding course.
+        cert = self.__parent__.certificate
+        ticket_allowed = False
+        for val in cert.values():
+            if val.course == course:
+                ticket_allowed = True
+                break
+        if not ticket_allowed:
+            raise TicketError(
+                _('%s is not part of the %s curriculum.'
+                  % (course.code, cert.code)))
         ticket.code = course.code
         ticket.title = course.title
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py	(revision 15428)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py	(revision 15429)
@@ -1338,6 +1338,13 @@
         self.student['studycourse']['200']['COURSE1'].outstanding = True
         self.browser.getControl("Add course ticket").click()
-        self.assertMatches(
-            '...Successfully added COURSE2...', self.browser.contents)
+        # Corresponding certificate course is missing
+        self.assertTrue(
+            'COURSE2 is not part of the CERT1 curriculum.'
+            in self.browser.contents)
+        self.app['faculties']['fac1']['dep1'].certificates[
+            'CERT1'].addCertCourse(self.course, level=100)
+        self.browser.getControl("Add course ticket").click()
+        self.assertTrue(
+            'Successfully added COURSE2' in self.browser.contents)
         return
 
