diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
index 38881163c5ce747a63745fead5961b825cdc4bdc..87f90ec1426aa17cc1950ea0a456a2a5f8f7fdcb 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
@@ -89,6 +89,12 @@ abstract class SimpleSAML_Metadata_MetaDataStorageHandler {
 			require_once('SimpleSAML/Metadata/MetaDataStorageHandlerFlatfile.php');
 			$sh = new SimpleSAML_Metadata_MetaDataStorageHandlerFlatfile();
 			
+		} elseif ($handler === 'saml2XMLmeta')  {
+
+			require_once('SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php');
+			$sh = new SimpleSAML_Metadata_MetaDataStorageHandlerFlatfile();
+
+		
 		} else {
 			throw new Exception('Invalid value for the [metadata.handler] configuration option. Unknown handler: ' . $handler);
 		}
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
index 16497ea73ab48e5dac8fb013ddb92d0b38be8821..bfa1db8c67b56adc656e142e10f39e52bb831edc 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
@@ -20,8 +20,6 @@ class MetaDataStorageHandlerSAML2Meta extends SimpleSAML_Metadata_MetaDataStorag
 
 
 
-
-
 	/* This constructor is included in case it is needed in the the
 	 * future. Including it now allows us to write parent::__construct() in
 	 * the subclasses of this class.