Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/studylevel.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/studylevel.py	(revision 16520)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/studylevel.py	(revision 16521)
@@ -91,9 +91,9 @@
         """Uniben Course Grading System
         """
+        if self.total_score is None:
+            return (None, None)
         if self.total_score < self.passmark:
             return ('F',0)
         if getattr(self, 'grading_sys', 'A') == 'A':
-            if self.total_score is None:
-                return (None, None)
             if self.total_score >= 70:
                 return ('A',5)
@@ -108,6 +108,4 @@
             return ('F',0)
         else:
-            if self.total_score is None:
-                return (None, None)
             if self.total_score >= 70:
                 return ('A',5)
