Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 13688)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 13689)
@@ -187,9 +187,8 @@
                 amount = academic_session.clearance_fee
             p_item = student['studycourse'].certificate.code
+            if amount in (0.0, None):
+                return _(u'Amount could not be determined.'), None
             # Add Matric Gown Fee and Lapel Fee
-            if category.endswith('_incl'):
-                if amount is None:
-                    # Otherwise we can't add somtehing
-                    amount = 0.0
+            if category == 'clearance_incl':
                 amount += gateway_net_amt(academic_session.matric_gown_fee) + \
                     gateway_net_amt(academic_session.lapel_fee)
