diff --git a/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFileSystem.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFileSystem.java
index 0a5f8f1b3..a373b7234 100644
--- a/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFileSystem.java
+++ b/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFileSystem.java
@@ -3,10 +3,11 @@ package org.cryptomator.filesystem.shortening;
 import org.cryptomator.filesystem.FileSystem;
 import org.cryptomator.filesystem.Folder;
 
-class ShorteningFileSystem extends ShorteningFolder implements FileSystem {
+public class ShorteningFileSystem extends ShorteningFolder implements FileSystem {
 
 	public ShorteningFileSystem(Folder root, Folder metadataRoot, int threshold) {
 		super(null, root, "", new FilenameShortener(metadataRoot, threshold));
+		create();
 	}
 
 }
diff --git a/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFolder.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFolder.java
index e308064d8..8429dc9a6 100644
--- a/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFolder.java
+++ b/main/filesystem-nameshortening/src/main/java/org/cryptomator/filesystem/shortening/ShorteningFolder.java
@@ -55,7 +55,7 @@ class ShorteningFolder extends DelegatingFolder<ShorteningFolder, ShorteningFile
 		if (exists()) {
 			return;
 		}
-		parent().get().create();
+		parent().ifPresent(Folder::create);
 		if (shortener.isShortened(shortenedName())) {
 			shortener.saveMapping(name(), shortenedName());
 		}