Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 14412)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 14413)
@@ -172,4 +172,9 @@
     @property
     def remark(self):
+        if self.gpa_params[1] == 0:
+            # No credits weighted at this level
+            return 'FRNS'
+        if self.level_verdict == 'FRNS':
+            return 'FRNS'
         certificate = getattr(self.__parent__,'certificate',None)
         end_level = getattr(certificate, 'end_level', None)
@@ -184,6 +189,4 @@
                 return 'FRNS'
             if len(self.passed_params[5]):
-                return 'FRNS'
-            if self.level_verdict == 'FRNS':
                 return 'FRNS'
             if self.cumulative_params[0] < failed_limit:
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 14412)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 14413)
@@ -44,4 +44,7 @@
     def getDegreeClassNumber(self, level_obj):
         if level_obj.gpa_params[1] == 0:
+            # No credits weighted
+            return 0
+        if level_obj.level_verdict == 'FRNS':
             return 0
         certificate = getattr(level_obj.__parent__,'certificate',None)
@@ -53,6 +56,4 @@
                 return 0
             if len(not_taken_courses):
-                return 0
-            if level_obj.level_verdict == 'FRNS':
                 return 0
         # use gpa_boundaries above
