diff --git a/modules/authtwitter/lib/Auth/Source/Twitter.php b/modules/authtwitter/lib/Auth/Source/Twitter.php
index af50d44416766946b0baed22eda63abc4f01f2d5..8ee8c7d97c92ccfeafd5f06596acac27637c45bd 100644
--- a/modules/authtwitter/lib/Auth/Source/Twitter.php
+++ b/modules/authtwitter/lib/Auth/Source/Twitter.php
@@ -38,18 +38,10 @@ class sspmod_authtwitter_Auth_Source_Twitter extends SimpleSAML_Auth_Source {
 		/* Call the parent constructor first, as required by the interface. */
 		parent::__construct($info, $config);
 
-		if (!array_key_exists('key', $config))
-			throw new Exception('Twitter authentication source is not properly configured: missing [key]');
-		
-		$this->key = $config['key'];
-		
-		if (!array_key_exists('secret', $config))
-			throw new Exception('Twitter authentication source is not properly configured: missing [secret]');
-
-		$this->secret = $config['secret'];
-
-		// require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/extlibinc/facebook.php');
+		$configObject = SimpleSAML_Configuration::loadFromArray($config, 'authsources[' . var_export($this->authId, TRUE) . ']');
 
+		$this->key = $configObject->getString('key');
+		$this->secret = $configObject->getString('secret');
 	}
 
 
@@ -127,5 +119,3 @@ class sspmod_authtwitter_Auth_Source_Twitter extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file