Index: /WAeUP_SRP/trunk/WAeUPTool.py
===================================================================
--- /WAeUP_SRP/trunk/WAeUPTool.py	(revision 1793)
+++ /WAeUP_SRP/trunk/WAeUPTool.py	(revision 1794)
@@ -283,12 +283,16 @@
         logger = logging.getLogger('WAeUPTool.makeStudentData')
         students_folder = self.portal_url.getPortalObject().campus.students
-        res = self.students_catalog(id=student_id)
-        if res:
-            st = res[0]
-        res = self.returning_import(matric_no = st.matric_no)
+        #res = self.students_catalog(id=student_id)
+        #if res:
+        #    st = res[0]
+        #res = self.returning_import(matric_no = st.matric_no)
+        res = self.returning_import(id = student_id)        
         if res:
             student = res[0]
+        else:
+            logger.info('%s Id not found in returning_import' % student_id)
+            return
         logger.info('%s creates data structure' % student_id)
-        s_results = self.results_import(matric_no = st.matric_no)
+        s_results = self.results_import(matric_no = student.matric_no)
         lnr = self.getLevelFromResultsCosCode(s_results)
         level = "%d00" % lnr
Index: /WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py	(revision 1793)
+++ /WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py	(revision 1794)
@@ -78,5 +78,5 @@
 student['session'] = session
 registered = None
-res = context.students_catalog(matric_no = student_rec.matric_no)
+res = context.returning_import(matric_no = student_rec.matric_no)
 if res:
     student_id = res[0].id
Index: /WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py	(revision 1793)
+++ /WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py	(revision 1794)
@@ -21,5 +21,11 @@
     sid = st_res[0].id
 else:
-    logger.info('Student object with matric_no does not exist' % matric_no)
+    st_res = context.returning_import(matric_no = matric_no)
+    if st_res:
+        sid = st_res[0].id
+        logger.info('Student object with matric_no %s does not exist in students_catalog. Id taken from returning_import.' % matric_no)
+    else:
+        logger.info('Student object with matric_no %s neither exists in students_catalog nor in returning_import.' % matric_no)
+        return
 res,psm,ds = lt.renderLayout(layout_id= 'student_session_results_search',
                       schema_id= 'student_returning',
