diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java
index a1be6f16b..1bdb2514c 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java
@@ -183,7 +183,7 @@ public class LiveBeansModel {
 		for (Exception e : exceptions) {
 			Log.log(e);
 		}
-		return LiveBeansModel.builder().build(); // allways return at least an empty model.
+		return LiveBeansModel.builder().build(); // always return at least an empty model.
 	}
 
 	private final ImmutableListMultimap<String, LiveBean> beansViaType;
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ChangeHistory.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ChangeHistory.java
index 2348a62c7..22699a4c7 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ChangeHistory.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ChangeHistory.java
@@ -44,13 +44,15 @@ public class ChangeHistory {
 		Change result = null;
 
 		LiveBeansModel currentBeans = this.runningProcess.getBeans();
-		
-		if (lastBeans == null) {
-			lastBeans = currentBeans;
-		}
-		else if (currentBeans != null) {
-			result = calculateBeansDiff(lastBeans, currentBeans, result);
-			lastBeans = currentBeans;
+		if (!currentBeans.isEmpty()) {
+
+			if (lastBeans == null) {
+				lastBeans = currentBeans;
+			}
+			else if (lastBeans != null && currentBeans != null) {
+				result = calculateBeansDiff(lastBeans, currentBeans, result);
+				lastBeans = currentBeans;
+			}
 		}
 		
 		return result;