diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java
index bd80cf64e..4860d82cb 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java
@@ -66,6 +66,7 @@ public class LocalSpringBootApp extends AbstractSpringBootApp {
 				address = vm.startLocalManagementAgent();
 			} catch (IOException e) {
 				logger.error("Error starting local management agent", e);
+				dispose();
 			}
 		}
 		return address;