diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/lib/Auth/Process/AttributeAdd.php
index fd3828a699751c210a4b275da4aec0b483c41751..eeb6102f370adf12a6c11316aee24378ac08aec7 100644
--- a/modules/core/lib/Auth/Process/AttributeAdd.php
+++ b/modules/core/lib/Auth/Process/AttributeAdd.php
@@ -45,10 +45,6 @@ class sspmod_core_Auth_Process_AttributeAdd extends SimpleSAML_Auth_ProcessingFi
 				continue;
 			}
 
-			if(!is_string($name)) {
-				throw new Exception('Invalid attribute name: ' . var_export($name, TRUE));
-			}
-
 			if(!is_array($values)) {
 				$values = array($values);
 			}
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
index 3db1f388d3fac58df6c3165c538b5724de355f5a..29e900db754cbf1303a081fefc33ae89677eabff 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
@@ -154,25 +154,6 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
         $result = self::processFilter($config, $request);
     }
 
-    /**
-     * Test wrong attribute name
-     *
-     * @expectedException Exception
-     */
-    public function testWrongAttributeName()
-    {
-        $config = array(
-            '%replace',
-             true => array('value2'),
-        );
-        $request = array(
-            'Attributes' => array(
-                'test' => array('value1'),
-            ),
-        );
-        $result = self::processFilter($config, $request);
-    }
-
     /**
      * Test wrong attribute value
      *