diff --git a/lib/private/server.php b/lib/private/server.php
index 6bd0eabb6e35f3c3538d37c28b57be8abd43b3ed..3b07f5711e7732b38b8e89eb8365564c218f74c1 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -255,7 +255,11 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\Files\Folder
 	 */
 	function getUserFolder() {
-		$dir = '/' . $this->getUserSession()->getUser()->getUID();
+		$user = $this->getUserSession()->getUser();
+		if (!$user) {
+			return null;
+		}
+		$dir = '/' . $user->getUID();
 		$root = $this->getRootFolder();
 		$folder = null;