diff --git a/modules/core/lib/Auth/Process/AttributeLimit.php b/modules/core/lib/Auth/Process/AttributeLimit.php
index c7b805b349c198031dad5f94ca4020f5463689d1..0cf1a3f9b5de21c8a11fa59849a8d0d9bce22af3 100644
--- a/modules/core/lib/Auth/Process/AttributeLimit.php
+++ b/modules/core/lib/Auth/Process/AttributeLimit.php
@@ -63,8 +63,10 @@ class sspmod_core_Auth_Process_AttributeLimit extends SimpleSAML_Auth_Processing
 				} else {
 					$this->allowedAttributes = $request['Source']['attributes'];
 				}
-			} else {
+			} elseif (array_key_exists('attributes', $request['Destination'])) {
 				$this->allowedAttributes = $request['Destination']['attributes'];
+			} else {
+				return;
 			}
 		}