Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 8842)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 8843)
@@ -27,5 +27,5 @@
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.interface import implementedBy
-from zope.schema.interfaces import RequiredMissing
+from zope.schema.interfaces import RequiredMissing, ConstraintNotSatisfied
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.kofa.app import University
@@ -37,4 +37,5 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.vocabularies import RegNumNotInSource
+from waeup.kofa.students.studycourse import StudentStudyCourse
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.kofa.applicants.interfaces import IApplicant, IApplicantEdit
@@ -119,5 +120,5 @@
         if self.course_admitted is None:
             return False, _('No course admitted provided.')
-        # Add student object
+        # Set student attributes
         try:
             for name in self.create_names:
@@ -125,13 +126,18 @@
         except RequiredMissing, err:
             return False, _('RequiredMissing: %s' % err)
+        except:
+            return False, _('Error: %s' % err)
+        # Finally prove if the certificate still exists
+        try:
+            StudentStudyCourse().certificate = self.course_admitted
+        except ConstraintNotSatisfied, err:
+            return False, _('ConstraintNotSatisfied: %s' % self.course_admitted.code)
+        # Add student
         site = grok.getSite()
         site['students'].addStudent(student)
-        self.student_id = student.student_id
         IWorkflowInfo(self).fireTransition('create')
         IWorkflowInfo(student).fireTransition('admit')
-
         # Set password
         IUserAccount(student).setPassword(self.application_number)
-
         # Save the certificate and set session attributes
         student['studycourse'].certificate = self.course_admitted
@@ -143,5 +149,4 @@
         # Update the catalog
         notify(grok.ObjectModifiedEvent(student))
-
         # Save application slip
         self._createApplicationPDF(student, view=view)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py	(revision 8842)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py	(revision 8843)
@@ -67,4 +67,12 @@
         self.browser.getControl(name="form.course_admitted").value = ['CERT1']
         self.browser.getControl("Save").click()
+        # Maybe the certificate has meanwhile been removed
+        del self.app['faculties']['fac1']['dep1'].certificates['CERT1']
+        (success, msg) = self.applicant.createStudent()
+        self.assertFalse(success)
+        self.assertTrue('ConstraintNotSatisfied: CERT1' in msg)
+        # Ok, lets add the certificate and try again
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            self.certificate)
         (success, msg) = self.applicant.createStudent()
         self.assertTrue('created' in msg)
