Index: WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1416)
+++ WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1417)
@@ -113,5 +113,7 @@
                              p_review_state == 'created' :
             wftool.doActionFor(student_per,'open')
-        
+        res = context.students_catalog(id = str(member))
+        matric_no = res[0].matric_no
+        is_imported = context.returning_import(matric_no = matric_no)
         if s_review_state == "application_pin_entered":
             redirect_url = "%s/application_edit_form" % student.absolute_url()
@@ -122,5 +124,5 @@
         elif s_review_state == "cleared_and_validated":
             redirect_url = "%s/personal_edit_form" % student.absolute_url()
-        elif s_review_state == "returning":
+        elif s_review_state == "returning" and is_imported:
             redirect_url = "%s/session_results_view" % student.absolute_url()
         else:
Index: WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py	(revision 1416)
+++ WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py	(revision 1417)
@@ -53,4 +53,6 @@
             context.students_catalog.modifyRecord(id = student_id,
                                                   course = course,
+                                                  level = ds.get('current_level'),
+                                                  verdict = ds.get('current_verdict'),
                                                   faculty = c_path[-4],
                                                   department = c_path[-3],
Index: WAeUP_SRP/trunk/skins/waeup_student/add_student.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/add_student.py	(revision 1416)
+++ WAeUP_SRP/trunk/skins/waeup_student/add_student.py	(revision 1417)
@@ -49,6 +49,6 @@
 matric_no = ds.get('matric_no')
 res = context.students_catalog(matric_no = matric_no)
-psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
 if res:
+    psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
     return context.add_student_form(rendered = rendered,
                                  psm = psm,
Index: WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py	(revision 1416)
+++ WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py	(revision 1417)
@@ -8,4 +8,5 @@
 pr = context.portal_registration
 
+request = context.REQUEST
 returning = context.returning_import
 results = context.results_import
@@ -45,5 +46,9 @@
 
 res = returning(matric_no = matric_no)
-student_from_returning = res[0]
+if res:
+    student_from_returning = res[0]
+else:
+    return None
+
 res = results(matric_no = matric_no)
 results = res
Index: WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py	(revision 1416)
+++ WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py	(revision 1417)
@@ -45,5 +45,7 @@
 current_level = sbrain.level
 levels = context.objectIds()
-if current_level not in levels:
+#levels.sort()
+#if int(current_level) > int(levels[-1]):
+if not levels:
     context.invokeFactory('StudentStudyLevel',"%s" % current_level)
     level = getattr(context,"%s" % current_level)
Index: WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt	(revision 1416)
+++ WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt	(revision 1417)
@@ -11,5 +11,5 @@
       </a>
       <h3> 
-        <span tal:condition="python:is_so and s_info">
+        <span tal:condition="is_so">
           <span tal:content="info/student/name" />:
         </span>
