diff --git a/modules/saml/lib/Auth/Process/AttributeNameID.php b/modules/saml/lib/Auth/Process/AttributeNameID.php
index 3b264afdf1bb692c38c82ae848df70aa75c59fa2..16f7083eaba585c67793adf5c350169edcda1808 100644
--- a/modules/saml/lib/Auth/Process/AttributeNameID.php
+++ b/modules/saml/lib/Auth/Process/AttributeNameID.php
@@ -1,59 +1,72 @@
 <?php
 
+
 /**
- * Authproc filter to create a NameID from an attribute.
+ * Authentication processing filter to create a NameID from an attribute.
  *
- * @package simpleSAMLphp
+ * @package SimpleSAMLphp
  */
-class sspmod_saml_Auth_Process_AttributeNameID extends sspmod_saml_BaseNameIDGenerator {
-
-	/**
-	 * The attribute we should use as the NameID.
-	 *
-	 * @var string
-	 */
-	private $attribute;
-
-
-	/**
-	 * Initialize this filter, parse configuration.
-	 *
-	 * @param array $config  Configuration information about this filter.
-	 * @param mixed $reserved  For future use.
-	 */
-	public function __construct($config, $reserved) {
-		parent::__construct($config, $reserved);
-		assert('is_array($config)');
-
-		if (!isset($config['Format'])) {
-			throw new SimpleSAML_Error_Exception('AttributeNameID: Missing required option \'Format\'.');
-		}
-		$this->format = (string)$config['Format'];
-
-		if (!isset($config['attribute'])) {
-			throw new SimpleSAML_Error_Exception('AttributeNameID: Missing required option \'attribute\'.');
-		}
-		$this->attribute = (string)$config['attribute'];
-	}
-
-
-	/**
-	 * Get the NameID value.
-	 *
-	 * @return string|NULL  The NameID value.
-	 */
-	protected function getValue(array &$state) {
-
-		if (!isset($state['Attributes'][$this->attribute]) || count($state['Attributes'][$this->attribute]) === 0) {
-			SimpleSAML_Logger::warning('Missing attribute ' . var_export($this->attribute, TRUE) . ' on user - not generating attribute NameID.');
-			return NULL;
-		}
-		if (count($state['Attributes'][$this->attribute]) > 1) {
-			SimpleSAML_Logger::warning('More than one value in attribute ' . var_export($this->attribute, TRUE) . ' on user - not generating attribute NameID.');
-		}
-		$value = array_values($state['Attributes'][$this->attribute]); /* Just in case the first index is no longer 0. */
-		$value = $value[0];
-		return $value;
-	}
+class sspmod_saml_Auth_Process_AttributeNameID extends sspmod_saml_BaseNameIDGenerator
+{
+
+    /**
+     * The attribute we should use as the NameID.
+     *
+     * @var string
+     */
+    private $attribute;
+
+
+    /**
+     * Initialize this filter, parse configuration.
+     *
+     * @param array $config Configuration information about this filter.
+     * @param mixed $reserved For future use.
+     *
+     * @throws SimpleSAML_Error_Exception If the required options 'Format' or 'attribute' are missing.
+     */
+    public function __construct($config, $reserved)
+    {
+        parent::__construct($config, $reserved);
+        assert('is_array($config)');
+
+        if (!isset($config['Format'])) {
+            throw new SimpleSAML_Error_Exception("AttributeNameID: Missing required option 'Format'.");
+        }
+        $this->format = (string) $config['Format'];
+
+        if (!isset($config['attribute'])) {
+            throw new SimpleSAML_Error_Exception("AttributeNameID: Missing required option 'attribute'.");
+        }
+        $this->attribute = (string) $config['attribute'];
+    }
+
+
+    /**
+     * Get the NameID value.
+     *
+     * @param array $state The state array.
+     * @return string|null The NameID value.
+     */
+    protected function getValue(array &$state)
+    {
+
+        if (!isset($state['Attributes'][$this->attribute]) || count($state['Attributes'][$this->attribute]) === 0) {
+            SimpleSAML_Logger::warning(
+                'Missing attribute '.var_export($this->attribute, true).
+                ' on user - not generating attribute NameID.'
+            );
+            return null;
+        }
+        if (count($state['Attributes'][$this->attribute]) > 1) {
+            SimpleSAML_Logger::warning(
+                'More than one value in attribute '.var_export($this->attribute, true).
+                ' on user - not generating attribute NameID.'
+            );
+        }
+        $value = array_values($state['Attributes'][$this->attribute]); // just in case the first index is no longer 0
+        $value = $value[0];
+        return $value;
+    }
 
 }