diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index e92a585e3de560e9c37b6549124e8528c24e6fd4..f4640bd1ff641ff2e05903da3b7141d6774ec261 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -430,6 +430,10 @@ class SimpleSAML_Configuration {
 			$path = $this->configuration[$name];
 		}
 
+		if ($path === NULL) {
+			return NULL;
+		}
+
 		return $this->resolvePath($path) . '/';
 	}