Index: main/waeup.aaua/trunk/src/waeup/aaua/interswitch/browser.py
===================================================================
--- main/waeup.aaua/trunk/src/waeup/aaua/interswitch/browser.py	(revision 11637)
+++ main/waeup.aaua/trunk/src/waeup/aaua/interswitch/browser.py	(revision 11648)
@@ -74,6 +74,11 @@
 
     def update(self):
-        student, certificate, xmldict = super(
-            CustomInterswitchPageStudent, self).update()
+        error = self.init_update()
+        if error:
+            self.flash(error, type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
+        student = self.student
+        xmldict = self.xmldict
         # Provider data
         xmldict['detail_ref'] = self.context.p_id
Index: main/waeup.aaua/trunk/src/waeup/aaua/students/utils.py
===================================================================
--- main/waeup.aaua/trunk/src/waeup/aaua/students/utils.py	(revision 11637)
+++ main/waeup.aaua/trunk/src/waeup/aaua/students/utils.py	(revision 11648)
@@ -109,11 +109,6 @@
         if amount in (0.0, None):
             return _('Amount could not be determined.'), None
-        for key in student['payments'].keys():
-            ticket = student['payments'][key]
-            if ticket.p_state == 'paid' and\
-               ticket.p_category == category and \
-               ticket.p_item == p_item and \
-               ticket.p_session == p_session:
-                  return _('This type of payment has already been made.'), None
+        if self.samePaymentMade(student, category, p_item, p_session):
+            return _('This type of payment has already been made.'), None
         if self._isPaymentDisabled(p_session, category, student):
             return _('Payment temporarily disabled.'), None
