Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/studycourse.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/studycourse.py	(revision 7532)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/studycourse.py	(revision 7533)
@@ -50,20 +50,21 @@
 
         #Create course tickets automatically
-        for key, val in cert.items():
-            if val.level != studylevel.level:
-                continue
-            ticket = CourseTicket()
-            ticket.code = val.getCourseCode()
-            ticket.automatic = True
-            ticket.core_or_elective = val.core_or_elective
-            ticket.title = val.course.title
-            ticket.faculty = val.course.__parent__.__parent__.__parent__.title
-            ticket.department = val.course.__parent__.__parent__.title
-            ticket.fcode = val.course.__parent__.__parent__.__parent__.code
-            ticket.dcode = val.course.__parent__.__parent__.code
-            ticket.credits = val.course.credits
-            ticket.passmark = val.course.passmark
-            ticket.semester = val.course.semester
-            self[str(studylevel.level)][val.getCourseCode()] = ticket
+        if cert is not None:
+            for key, val in cert.items():
+                if val.level != studylevel.level:
+                    continue
+                ticket = CourseTicket()
+                ticket.code = val.getCourseCode()
+                ticket.automatic = True
+                ticket.core_or_elective = val.core_or_elective
+                ticket.title = val.course.title
+                ticket.faculty = val.course.__parent__.__parent__.__parent__.title
+                ticket.department = val.course.__parent__.__parent__.title
+                ticket.fcode = val.course.__parent__.__parent__.__parent__.code
+                ticket.dcode = val.course.__parent__.__parent__.code
+                ticket.credits = val.course.credits
+                ticket.passmark = val.course.passmark
+                ticket.semester = val.course.semester
+                self[str(studylevel.level)][val.getCourseCode()] = ticket
         return
 
