diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java b/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java
index ace17ac7200c..0db203d39adc 100644
--- a/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java
+++ b/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java
@@ -245,7 +245,9 @@ public String extractNextToken(ListScanConfigsResponse payload) {
 
             @Override
             public Iterable<ScanConfig> extractResources(ListScanConfigsResponse payload) {
-              return payload.getScanConfigsList();
+              return payload.getScanConfigsList() != null
+                  ? payload.getScanConfigsList()
+                  : ImmutableList.<ScanConfig>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java b/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java
index 419ecfe0d5ed..e9240bdef06f 100644
--- a/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java
+++ b/google-cloud-clients/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java
@@ -336,7 +336,9 @@ public String extractNextToken(ListOccurrencesResponse payload) {
 
             @Override
             public Iterable<Occurrence> extractResources(ListOccurrencesResponse payload) {
-              return payload.getOccurrencesList();
+              return payload.getOccurrencesList() != null
+                  ? payload.getOccurrencesList()
+                  : ImmutableList.<Occurrence>of();
             }
           };
 
@@ -370,7 +372,9 @@ public String extractNextToken(ListNotesResponse payload) {
 
             @Override
             public Iterable<Note> extractResources(ListNotesResponse payload) {
-              return payload.getNotesList();
+              return payload.getNotesList() != null
+                  ? payload.getNotesList()
+                  : ImmutableList.<Note>of();
             }
           };
 
@@ -408,7 +412,9 @@ public String extractNextToken(ListNoteOccurrencesResponse payload) {
 
             @Override
             public Iterable<Occurrence> extractResources(ListNoteOccurrencesResponse payload) {
-              return payload.getOccurrencesList();
+              return payload.getOccurrencesList() != null
+                  ? payload.getOccurrencesList()
+                  : ImmutableList.<Occurrence>of();
             }
           };