diff --git a/src/saml2/entity_category/swamid.py b/src/saml2/entity_category/swamid.py
index 7d07f0f..743eb97 100644
--- a/src/saml2/entity_category/swamid.py
+++ b/src/saml2/entity_category/swamid.py
@@ -2,7 +2,7 @@ __author__ = 'rolandh'
 
 
 NAME = ["givenName", "displayName", "sn"]
-STATIC_ORG_INFO = ["c", "o", "co"]
+STATIC_ORG_INFO = ["c", "o", "co", "norEduOrgAcronym"]
 OTHER = ["eduPersonPrincipalName", "eduPersonScopedAffiliation", "mail"]
 
 # These give you access to information
diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py
index bbde35f..9c16438 100644
--- a/src/saml2/mdstore.py
+++ b/src/saml2/mdstore.py
@@ -773,7 +773,8 @@ class MetadataStore(object):
         return [m["text"] for m in ad["affiliate_member"]]
 
     def entity_categories(self, entity_id):
-        ext = self.__getitem__(entity_id)["extensions"]
+        ent = self.__getitem__(entity_id)
+        ext = ent["extensions"]
         res = []
         for elem in ext["extension_elements"]:
             if elem["__class__"] == ENTITYATTRIBUTES: