Index: /WAeUP_SRP/base/WAeUPTool.py
===================================================================
--- /WAeUP_SRP/base/WAeUPTool.py	(revision 2319)
+++ /WAeUP_SRP/base/WAeUPTool.py	(revision 2320)
@@ -1082,4 +1082,7 @@
     security.declareProtected(ModifyPortalContent,'mass_create_certificate_course') ###(
     def mass_create_certificate_course(self,mapping):
+        if getattr(self,'_v_courses',None) is None:
+            res = self.courses_catalog()
+            self._v_courses= [course.code for course in res]  
         if getattr(self,'_v_ceritficates',None) is None:
             res = self.portal_catalog(portal_type = "Certificate")
@@ -1088,5 +1091,5 @@
                 self._v_certificates[cert.getId] = cert.getObject()
         certificate_course_id = mapping.get('code')
-        if not self.courses_catalog(code = certificate_course_id):
+        if certificate_course_id not in self._v_courses: 
             return '', "No Course with ID: %s" % certificate_course_id
         cert_id = mapping['certificate_code']
