diff --git a/api/src/Session.php b/api/src/Session.php
index 0321fc60b7..c309f09e9f 100644
--- a/api/src/Session.php
+++ b/api/src/Session.php
@@ -1630,7 +1630,7 @@ class Session
 		}
 		else
 		{
-			$query[] = $prefix.'='.urlencode($values);
+			$query[] = $prefix.'='.urlencode($values ?? '');
 		}
 		return $query;
 	}
diff --git a/api/src/Vfs/Base.php b/api/src/Vfs/Base.php
index e96cb586ed..59e2232db2 100644
--- a/api/src/Vfs/Base.php
+++ b/api/src/Vfs/Base.php
@@ -291,9 +291,9 @@ class Base
 		// setting default user, passwd and domain, if it's not contained int the url
 		$defaults = array(
 			'user' => $GLOBALS['egw_info']['user']['account_lid'],
-			'pass' => urlencode($GLOBALS['egw_info']['user']['passwd']),
+			'pass' => urlencode($GLOBALS['egw_info']['user']['passwd'] ?? ''),
 			'host' => $GLOBALS['egw_info']['user']['domain'],
-			'home' => str_replace(array('\\\\', '\\'), array('', '/'), $GLOBALS['egw_info']['user']['homedirectory']),
+			'home' => str_replace(array('\\\\', '\\'), array('', '/'), $GLOBALS['egw_info']['user']['homedirectory'] ?? ''),
 		);
 		$parts = array_merge(Vfs::parse_url($_path), Vfs::parse_url($path) ?: [], $defaults);
 		if(!$parts['host'])