diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
index 85b2d5e65b39..ee4eca3d3a5b 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
@@ -283,7 +283,9 @@ public String extractNextToken(ListClustersResponse payload) {
 
             @Override
             public Iterable<Cluster> extractResources(ListClustersResponse payload) {
-              return payload.getClustersList();
+              return payload.getClustersList() != null
+                  ? payload.getClustersList()
+                  : ImmutableList.<Cluster>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
index 509a5121f2d5..8e86809108cf 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
@@ -235,7 +235,9 @@ public String extractNextToken(ListJobsResponse payload) {
 
             @Override
             public Iterable<Job> extractResources(ListJobsResponse payload) {
-              return payload.getJobsList();
+              return payload.getJobsList() != null
+                  ? payload.getJobsList()
+                  : ImmutableList.<Job>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java
index 691e2e00f732..5e1da5df3131 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java
@@ -283,7 +283,9 @@ public String extractNextToken(ListClustersResponse payload) {
 
             @Override
             public Iterable<Cluster> extractResources(ListClustersResponse payload) {
-              return payload.getClustersList();
+              return payload.getClustersList() != null
+                  ? payload.getClustersList()
+                  : ImmutableList.<Cluster>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java
index 9ec7538a4627..e645d2d7e28f 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java
@@ -235,7 +235,9 @@ public String extractNextToken(ListJobsResponse payload) {
 
             @Override
             public Iterable<Job> extractResources(ListJobsResponse payload) {
-              return payload.getJobsList();
+              return payload.getJobsList() != null
+                  ? payload.getJobsList()
+                  : ImmutableList.<Job>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java
index d0915d036d6f..07e55b175947 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java
@@ -272,7 +272,9 @@ public String extractNextToken(ListWorkflowTemplatesResponse payload) {
             @Override
             public Iterable<WorkflowTemplate> extractResources(
                 ListWorkflowTemplatesResponse payload) {
-              return payload.getTemplatesList();
+              return payload.getTemplatesList() != null
+                  ? payload.getTemplatesList()
+                  : ImmutableList.<WorkflowTemplate>of();
             }
           };