diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/YamlPropertiesJavaDefinitionHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/YamlPropertiesJavaDefinitionHandler.java
index 4a39d7118..1819934b5 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/YamlPropertiesJavaDefinitionHandler.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/YamlPropertiesJavaDefinitionHandler.java
@@ -91,7 +91,10 @@ public class YamlPropertiesJavaDefinitionHandler implements DefinitionHandler, L
 
 						if (assistContext != null) {
 							if (path.pointsAtValue()) {
-								return assistContext.getDefinitionsForPropertyValue(getNodeRegion(ast, offset));
+								DocumentRegion nodeRegion = getNodeRegion(ast, offset);
+								if (nodeRegion != null) {
+									return assistContext.getDefinitionsForPropertyValue(nodeRegion);
+								}
 							} else {
 								return assistContext.getDefinitionsForPropertyKey();
 							}