diff --git a/main/ui/src/main/java/org/cryptomator/ui/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/MainController.java
index 0d6440e5e..8bd720337 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainController.java
@@ -77,15 +77,15 @@ public class MainController implements Initializable, InitializationListener, Un
 	private void didClickAddDirectory(ActionEvent event) {
 		final DirectoryChooser dirChooser = new DirectoryChooser();
 		final File file = dirChooser.showDialog(stage);
-		addDirectory(file.toPath());
+		if (file != null) {
+			addDirectory(file.toPath());
+		}
 	}
 
 	/**
-	 * adds the given directory or selects it if it is already in the list of
-	 * directories.
+	 * adds the given directory or selects it if it is already in the list of directories.
 	 * 
-	 * @param file
-	 *            non-null, writable, existing directory
+	 * @param file non-null, writable, existing directory
 	 */
 	void addDirectory(final Path file) {
 		if (file != null && Files.isWritable(file)) {