diff --git a/src/saml2/metadata.py b/src/saml2/metadata.py
index 582c763..8a74f4b 100644
--- a/src/saml2/metadata.py
+++ b/src/saml2/metadata.py
@@ -45,7 +45,7 @@ def keep_updated(func, self, entity_id, *args, **kwargs):
 class MetaData(object):
     """ A class to manage metadata information """
     
-    def __init__(self, xmlsec_binary=None, attrconv=None, log=None):
+    def __init__(self, xmlsec_binary=None, attrconv=None, log=None, extras=None):
         self.log = log
         self.xmlsec_binary = xmlsec_binary
         self.attrconv = attrconv or []
@@ -393,20 +393,20 @@ class MetaData(object):
         name = ""
 
         try:
-            for org in self.entity[entity_id]["organization"]:
-                try:
-                    name = org.organization_display_name[0]
+            org = self.entity[entity_id]["organization"]
+            try:
+                name = org.organization_display_name[0]
+            except IndexError:
+                try: 
+                    name = org.organization_name[0]
                 except IndexError:
-                    try: 
-                        name = org.organization_name[0]
+                    try:
+                        name = org.organization_url[0]
                     except IndexError:
-                        try:
-                            name = org.organization_url[0]
-                        except IndexError:
-                            pass
-                
-                if name:
-                    name = name.text
+                        pass
+            
+            if name:
+                name = name.text
         except KeyError:
             pass
             
diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
index 9165d2b..5a40d21 100644
--- a/src/saml2/sigver.py
+++ b/src/saml2/sigver.py
@@ -211,11 +211,11 @@ def cert_from_key_info(key_info):
     res = []
     for x509_data in key_info.x509_data:
         #print "X509Data",x509_data
-        for x509_certificate in x509_data.x509_certificate:
-            cert = x509_certificate.text.strip()
-            cert = "\n".join(split_len("".join([
-                                        s.strip() for s in cert.split()]),64))
-            res.append(cert)
+        x509_certificate = x509_data.x509_certificate
+        cert = x509_certificate.text.strip()
+        cert = "\n".join(split_len("".join([
+                                    s.strip() for s in cert.split()]),64))
+        res.append(cert)
     return res
 
 def cert_from_instance(instance):