diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
index 49b12e6f4f..e2cc5c0d88 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
@@ -352,7 +352,11 @@ public CompletableFuture<Either<List<? extends Location>, List<? extends Locatio
 		if (h != null) {
 			return async.invoke(() -> {
 				List<Location> locations = h.handle(position);
-				return Either.<List<? extends Location>, List<? extends LocationLink>>forLeft(locations);
+				if (locations==null) {
+					// vscode client does not like to recieve null result. See: https://github.com/spring-projects/sts4/issues/309
+					locations = ImmutableList.of();
+				}
+				return Either.forLeft(locations);
 			});
 		}
 		return CompletableFuture.completedFuture(Either.forLeft(ImmutableList.of()));