diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java
index fe0dd3241..aa065e5b7 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2017 Pivotal, Inc.
+ * Copyright (c) 2016, 2022 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,13 +14,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ListenerList<T> {
 	
+	private static Logger log = LoggerFactory.getLogger(ListenerList.class);
+	
 	private List<Consumer<T>> listeners = new ArrayList<>();
 
 	public synchronized void fire(T evt) {
 		for (Consumer<T> l : listeners) {
-			l.accept(evt);
+			try {
+				l.accept(evt);
+			} catch (Exception e) {
+				log.error("", e);
+			}
 		}
 	}
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaConfig.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaConfig.java
index 8fe659a3a..310a2fb6d 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaConfig.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaConfig.java
@@ -125,8 +125,11 @@ public class BootJavaConfig implements InitializingBean {
 			// Legacy case
 			if ("true".equalsIgnoreCase(enabled)) {
 				return true;
+			} else if ("false".equalsIgnoreCase(enabled)) {
+				return false;
+			} else {
+				return Toggle.Option.valueOf(enabled) == Toggle.Option.ON;
 			}
-			return Toggle.Option.valueOf(enabled) == Toggle.Option.ON;
 		}
 	}