diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java
index a0f078881..14c136d1c 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java
@@ -230,6 +230,8 @@ public abstract class AbstractSpringBootApp implements SpringBootApp {
 					return cachedBeansModel;
 
 				} else {
+					// PT 160096886 - Don't throw exception, as actuator info will not be available when app stopping, and
+					// this is not an error condition. Return empty model instead.
 					return LiveBeansModel.builder().build();
 				}