diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index fa3d96d0e..3d63fd6be 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -254,8 +254,9 @@ public class VaultListController implements FxController {
 
 			Vault preparedVault = prepareVault(selectedDirectory, vaultComponentFactory, mountServices);
 
-			if (vaultListManager.get(preparedVault.getPath()).isPresent()) {
-				dialogs.prepareRecoveryVaultAlreadyExists(mainWindow, vaultListManager.get(preparedVault.getPath()).get().getDisplayName()) //
+			Optional<Vault> matchingVaultListEntry = vaultListManager.get(preparedVault.getPath());
+			if (matchingVaultListEntry.isPresent()) {
+				dialogs.prepareRecoveryVaultAlreadyExists(mainWindow, matchingVaultListEntry.get().getDisplayName()) //
 						.setOkAction(Stage::close) //
 						.build().showAndWait();
 				break;