diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index 66afa93458876269efb0cdd835536ae79f5f2e75..929cb5ebf0678bda483963630dde401a4e2f48c2 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -192,7 +192,7 @@ class SAMLBuilder
                 $ea->addChildren($a);
             }
             $this->entityDescriptor->setExtensions(
-                array_merge($this->entityDescriptor(), [$ea])
+                array_merge($this->entityDescriptor->getExtensions(), [$ea])
             );
         }
 
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 3f9eb3bcab3ddf2491cbad9d29c545e5f9dc2407..9619717585f1f828134a9d6dc32b63a19ea79e9c 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -353,7 +353,7 @@ class SAMLParser
         } elseif (\SimpleSAML\Utils\XML::isDOMNodeOfType($element, 'EntitiesDescriptor', '@md') === true) {
             return self::processDescriptorsElement(new \SAML2\XML\md\EntitiesDescriptor($element));
         } else {
-            throw new \Exception('Unexpected root node: ['.$element->getNamespaceURI().']:'.$element->getLocalName());
+            throw new \Exception('Unexpected root node: ['.$element->namespaceURI.']:'.$element->localName);
         }
     }