diff --git a/qute.ls/com.redhat.qute.ls/src/main/java/com/redhat/qute/ls/QuteTextDocumentService.java b/qute.ls/com.redhat.qute.ls/src/main/java/com/redhat/qute/ls/QuteTextDocumentService.java
index c29a7cf63..dd7f4b46e 100644
--- a/qute.ls/com.redhat.qute.ls/src/main/java/com/redhat/qute/ls/QuteTextDocumentService.java
+++ b/qute.ls/com.redhat.qute.ls/src/main/java/com/redhat/qute/ls/QuteTextDocumentService.java
@@ -264,20 +264,22 @@ public CompletableFuture<List<InlayHint>> inlayHint(InlayHintParams params) {
 
 	@Override
 	public CompletableFuture<CodeAction> resolveCodeAction(CodeAction codeAction) {
-		/*
-		 * {
-		 * resolverKind: ...,
-		 * textDocumentUri: ...,
-		 * resolverData: {
-		 * ...
-		 * }
-		 * }
-		 */
 		CodeActionUnresolvedData data = JSONUtility.toModel(codeAction.getData(), CodeActionUnresolvedData.class);
-		TextDocumentIdentifier textDocument = new TextDocumentIdentifier(data.getTextDocumentUri());
-		AbstractTextDocumentService service = getTextDocumentService(textDocument);
-		if (service != null) {
-			return service.resolveCodeAction(codeAction);
+		if (data != null) {
+			/*
+			 * {
+			 * resolverKind: ...,
+			 * textDocumentUri: ...,
+			 * resolverData: {
+			 * ...
+			 * }
+			 * }
+			 */
+			TextDocumentIdentifier textDocument = new TextDocumentIdentifier(data.getTextDocumentUri());
+			AbstractTextDocumentService service = getTextDocumentService(textDocument);
+			if (service != null) {
+				return service.resolveCodeAction(codeAction);
+			}
 		}
 		return CompletableFuture.completedFuture(null);
 	}