Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6227)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6228)
@@ -16,4 +16,5 @@
 from zope.authentication.interfaces import (
     IAuthentication, IUnauthenticatedPrincipal, ILogout)
+from zope.catalog.interfaces import ICatalog
 from zope.securitypolicy.interfaces import (
     IPrincipalRoleManager, IPrincipalRoleMap)
@@ -21,5 +22,4 @@
     getUtility, createObject,getAllUtilitiesRegisteredFor)
 from zope.component.interfaces import Invalid
-from zope.exceptions import DuplicationError
 from zope.session.interfaces import ISession
 from zope.event import notify
@@ -36,5 +36,5 @@
     IWAeUPObject, IUserContainer, IUserAccount, IDataCenter,
     IWAeUPXMLImporter, IWAeUPXMLExporter, IBatchProcessor,
-    ILocalRolesAssignable)
+    ILocalRolesAssignable, DuplicationError)
 from waeup.sirp.permissions import get_users_with_local_roles, getRoles
 from waeup.sirp.university.catalog import search
@@ -1330,7 +1330,21 @@
         certificate = createObject(u'waeup.Certificate')
         self.applyData(certificate, **data)
-        message = self.context.certificates.addCertificate(certificate)
+        try:
+            self.context.certificates.addCertificate(certificate)
+        except DuplicationError, error:
+            # signals duplication error
+            entries = error.entries
+            for entry in entries:
+                # show links to all certs with same code
+                message = 'A certificate with same code already exists: '
+                message += '<a href="%s">%s</a>' % (
+                    self.url(entry), getattr(entry, '__name__', u'Unnamed'))
+                self.flash(message)
+            self.redirect(self.url(self.context, u'@@addcertificate'))
+            return
+        message = u'Certificate %s successfully created.' % (certificate.code)
         self.flash(message)
         self.redirect(self.url(self.context, u'@@manage')+'#tab-3')
+        return
 
     @grok.action('Cancel', validator=NullValidator)
