Index: /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py
===================================================================
--- /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py	(revision 1562)
+++ /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py	(revision 1563)
@@ -71,12 +71,16 @@
     ## patch to assign dynamic roles for WAeUP
     while 1:
+        if self.isStudent():
+            break
         if callable(real_object) and hasattr(real_object,'im_self'):
             real_object = real_object.im_self
 
+        if real_object is None:
+            break
         if hasattr(real_object,'portal_type') and\
                    real_object.portal_type not in ("Student","StudentClearance","StudentStudyLevel"):
             break
 
-        #from pdb import set_trace;set_trace()
+        from pdb import set_trace;set_trace()
         # can be later simplified by replacing by students_catalog values - Henrik
         # getattr works always because of acquisition ?! Henrik
