diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index dbc37ebc239ea7d1a044389b3ff30ddc954f8108..25627f565133a43b6541fa5c9062f8c50c35af71 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -608,11 +608,12 @@ class Configuration implements Utils\ClearableState
             $path = $this->configuration[$name];
         }
 
+        $path = $this->resolvePath($path);
         if ($path === null) {
             return null;
         }
 
-        return $this->resolvePath($path).'/';
+        return $path.'/';
     }
 
 
diff --git a/psalm.xml b/psalm.xml
index da1d4dbaef71e6b2ce742152994351607b4d9ba2..3a016ea5513fe59bfe389f3a321b953788a02a1a 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,20 +8,7 @@
     allowStringToStandInForClass="true"
 >
     <projectFiles>
-        <directory name="lib/SimpleSAML/Auth" />
-        <directory name="lib/SimpleSAML/Bindings" />
-        <directory name="lib/SimpleSAML/Error" />
-        <directory name="lib/SimpleSAML/HTTP" />
-        <directory name="lib/SimpleSAML/IdP" />
-        <directory name="lib/SimpleSAML/Locale" />
-        <directory name="lib/SimpleSAML/Logger" />
-        <directory name="lib/SimpleSAML/Metadata" />
-        <directory name="lib/SimpleSAML/Module" />
-        <directory name="lib/SimpleSAML/Stats" />
-        <directory name="lib/SimpleSAML/Store" />
-        <directory name="lib/SimpleSAML/Utils" />
-        <directory name="lib/SimpleSAML/XHTML" />
-        <directory name="lib/SimpleSAML/XML" />
+        <directory name="lib/SimpleSAML" />
 
         <!-- Replaces all modules/... with this one-liner for 2.0
         <directory name="modules" />