diff --git a/google-cloud-clients/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java b/google-cloud-clients/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java
index 066c763e6f30..edf8b4186f9b 100644
--- a/google-cloud-clients/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java
+++ b/google-cloud-clients/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java
@@ -371,7 +371,9 @@ public String extractNextToken(ListDatasetsResponse payload) {
 
             @Override
             public Iterable<Dataset> extractResources(ListDatasetsResponse payload) {
-              return payload.getDatasetsList();
+              return payload.getDatasetsList() != null
+                  ? payload.getDatasetsList()
+                  : ImmutableList.<Dataset>of();
             }
           };
 
@@ -405,7 +407,9 @@ public String extractNextToken(ListModelsResponse payload) {
 
             @Override
             public Iterable<Model> extractResources(ListModelsResponse payload) {
-              return payload.getModelList();
+              return payload.getModelList() != null
+                  ? payload.getModelList()
+                  : ImmutableList.<Model>of();
             }
           };
 
@@ -444,7 +448,9 @@ public String extractNextToken(ListModelEvaluationsResponse payload) {
             @Override
             public Iterable<ModelEvaluation> extractResources(
                 ListModelEvaluationsResponse payload) {
-              return payload.getModelEvaluationList();
+              return payload.getModelEvaluationList() != null
+                  ? payload.getModelEvaluationList()
+                  : ImmutableList.<ModelEvaluation>of();
             }
           };