diff --git a/README.md b/README.md
index c8af81b..0a49b1c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 # Camunda TaskList Client
 
-This project was intially designed to simplify communication between a java backend and the Camunda 8 task list GraphQL APIs. Since GraphQL APIs are now deprecared, this client is now targetting REST endpoints. Contributions through PR are welcome!
+This project was intially designed to simplify communication between a java backend and the Camunda 8 task list GraphQL APIs. Since GraphQL APIs are now deprecated, this client is now targeting REST endpoints. Contributions through PR are welcome!
 
 :information_source: 8.3+ Relesases of this client are generated against Rest endpoints.
 
diff --git a/extension/client-java/src/main/java/io/camunda/tasklist/TasklistClientV1.java b/extension/client-java/src/main/java/io/camunda/tasklist/TasklistClientV1.java
index 8ead8c9..6cb4239 100644
--- a/extension/client-java/src/main/java/io/camunda/tasklist/TasklistClientV1.java
+++ b/extension/client-java/src/main/java/io/camunda/tasklist/TasklistClientV1.java
@@ -75,13 +75,17 @@ private static Form toForm(FormResponse formResponse) {
 
   private static SaveVariablesRequest fromVariablesToSave(List<RequestVariable> variables) {
     SaveVariablesRequest request = new SaveVariablesRequest();
-    request.setVariables(variables.stream().map(TasklistClientV1::fromVariable).toList());
+    if (variables != null) {
+      request.setVariables(variables.stream().map(TasklistClientV1::fromVariable).toList());
+    }
     return request;
   }
 
   private static TaskCompleteRequest fromVariablesToComplete(List<RequestVariable> variables) {
     TaskCompleteRequest request = new TaskCompleteRequest();
-    request.setVariables(variables.stream().map(TasklistClientV1::fromVariable).toList());
+    if (variables != null) {
+      request.setVariables(variables.stream().map(TasklistClientV1::fromVariable).toList());
+    }
     return request;
   }
 
@@ -94,10 +98,12 @@ private static VariableInputDTO fromVariable(RequestVariable variable) {
 
   private static VariablesSearchRequest fromVariableSearch(VariableSearch variableSearch) {
     VariablesSearchRequest request = new VariablesSearchRequest();
-    request.setIncludeVariables(
-        variableSearch.includeVariables().stream()
-            .map(TasklistClientV1::fromIncludeVariable)
-            .toList());
+    if (variableSearch.includeVariables() != null) {
+      request.setIncludeVariables(
+          variableSearch.includeVariables().stream()
+              .map(TasklistClientV1::fromIncludeVariable)
+              .toList());
+    }
     request.setVariableNames(variableSearch.variableNames());
     return request;
   }