diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
index 0a2c3699c540..7ab25a63b13a 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
@@ -278,7 +278,9 @@ public String extractNextToken(SearchAgentsResponse payload) {
 
             @Override
             public Iterable<Agent> extractResources(SearchAgentsResponse payload) {
-              return payload.getAgentsList();
+              return payload.getAgentsList() != null
+                  ? payload.getAgentsList()
+                  : ImmutableList.<Agent>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java
index c4ed27094f81..8f883dae3947 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java
@@ -235,7 +235,9 @@ public String extractNextToken(ListContextsResponse payload) {
 
             @Override
             public Iterable<Context> extractResources(ListContextsResponse payload) {
-              return payload.getContextsList();
+              return payload.getContextsList() != null
+                  ? payload.getContextsList()
+                  : ImmutableList.<Context>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
index 894cae3c3d8a..069ec3342d0d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
@@ -343,7 +343,9 @@ public String extractNextToken(ListEntityTypesResponse payload) {
 
             @Override
             public Iterable<EntityType> extractResources(ListEntityTypesResponse payload) {
-              return payload.getEntityTypesList();
+              return payload.getEntityTypesList() != null
+                  ? payload.getEntityTypesList()
+                  : ImmutableList.<EntityType>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
index d5b02b07e881..0e7ba5ca03a1 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
@@ -271,7 +271,9 @@ public String extractNextToken(ListIntentsResponse payload) {
 
             @Override
             public Iterable<Intent> extractResources(ListIntentsResponse payload) {
-              return payload.getIntentsList();
+              return payload.getIntentsList() != null
+                  ? payload.getIntentsList()
+                  : ImmutableList.<Intent>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java
index 34578fe8a735..be6e0322e13d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java
@@ -246,7 +246,9 @@ public String extractNextToken(ListSessionEntityTypesResponse payload) {
             @Override
             public Iterable<SessionEntityType> extractResources(
                 ListSessionEntityTypesResponse payload) {
-              return payload.getSessionEntityTypesList();
+              return payload.getSessionEntityTypesList() != null
+                  ? payload.getSessionEntityTypesList()
+                  : ImmutableList.<SessionEntityType>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
index 903679697993..ca5e87afe6de 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
@@ -278,7 +278,9 @@ public String extractNextToken(SearchAgentsResponse payload) {
 
             @Override
             public Iterable<Agent> extractResources(SearchAgentsResponse payload) {
-              return payload.getAgentsList();
+              return payload.getAgentsList() != null
+                  ? payload.getAgentsList()
+                  : ImmutableList.<Agent>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
index 9696b4eb22b9..146c9332b74d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
@@ -235,7 +235,9 @@ public String extractNextToken(ListContextsResponse payload) {
 
             @Override
             public Iterable<Context> extractResources(ListContextsResponse payload) {
-              return payload.getContextsList();
+              return payload.getContextsList() != null
+                  ? payload.getContextsList()
+                  : ImmutableList.<Context>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java
index b7c14c5a4ec8..2f3be7ded502 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java
@@ -245,7 +245,9 @@ public String extractNextToken(ListDocumentsResponse payload) {
 
             @Override
             public Iterable<Document> extractResources(ListDocumentsResponse payload) {
-              return payload.getDocumentsList();
+              return payload.getDocumentsList() != null
+                  ? payload.getDocumentsList()
+                  : ImmutableList.<Document>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
index b89de7ad6286..c34ce42daabc 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
@@ -343,7 +343,9 @@ public String extractNextToken(ListEntityTypesResponse payload) {
 
             @Override
             public Iterable<EntityType> extractResources(ListEntityTypesResponse payload) {
-              return payload.getEntityTypesList();
+              return payload.getEntityTypesList() != null
+                  ? payload.getEntityTypesList()
+                  : ImmutableList.<EntityType>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
index e0f9267bd893..ededdc6d5492 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
@@ -271,7 +271,9 @@ public String extractNextToken(ListIntentsResponse payload) {
 
             @Override
             public Iterable<Intent> extractResources(ListIntentsResponse payload) {
-              return payload.getIntentsList();
+              return payload.getIntentsList() != null
+                  ? payload.getIntentsList()
+                  : ImmutableList.<Intent>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java
index 989875767d4a..4294f52f4aa8 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java
@@ -227,7 +227,9 @@ public String extractNextToken(ListKnowledgeBasesResponse payload) {
 
             @Override
             public Iterable<KnowledgeBase> extractResources(ListKnowledgeBasesResponse payload) {
-              return payload.getKnowledgeBasesList();
+              return payload.getKnowledgeBasesList() != null
+                  ? payload.getKnowledgeBasesList()
+                  : ImmutableList.<KnowledgeBase>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
index d515014c0716..a3a4fce3f92f 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
@@ -246,7 +246,9 @@ public String extractNextToken(ListSessionEntityTypesResponse payload) {
             @Override
             public Iterable<SessionEntityType> extractResources(
                 ListSessionEntityTypesResponse payload) {
-              return payload.getSessionEntityTypesList();
+              return payload.getSessionEntityTypesList() != null
+                  ? payload.getSessionEntityTypesList()
+                  : ImmutableList.<SessionEntityType>of();
             }
           };