diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index 7f0c3c1986ea78c84b17378c810d30079e7ad894..1f979e4919714b4a80efe2aadb78112d95424c4a 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -45,6 +45,14 @@ class SimpleSAML_Configuration {
 		if (!isset($this->configuration)) {
 			$this->loadConfig();
 		}
+
+		/* Avoid notice about non-existant member of array
+		 * if an option isn't set.
+		 */
+		if (!array_key_exists($name, $this->configuration)) {
+			return NULL;
+		}
+
 		return $this->configuration[$name];
 	}