=== modified file 'idp/extra/modules/saml2.py'
--- idp/extra/modules/saml2.py	2009-04-14 16:44:50 +0000
+++ idp/extra/modules/saml2.py	2009-09-21 12:56:48 +0000
@@ -29,11 +29,18 @@
         if not service.cdg59siid in accesses:
             continue
         if not service.cdg59metadataURL:
-            continue
+            try:
+                service_type = directory.get_service(service.cdg59serviceType)
+            except KeyError:
+                # ignore service type that has been removed globally
+                continue
+            metadata_url = service_type.cdg59metadataURL
+        else:
+            metadata_url = service.cdg59metadataURL
 
         try:
             klp = [x for x, y in providers.items() if \
-                  service.cdg59metadataURL == y.get('metadata_url')] [0]
+                  metadata_url == y.get('metadata_url')] [0]
         except IndexError:
             continue