diff --git a/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClient.java b/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClient.java
index 330c93f91bd4..69a1e7e78037 100644
--- a/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClient.java
+++ b/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClient.java
@@ -27,7 +27,6 @@
 import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.UnaryCallable;
-import com.google.cloud.securitycenter.v1beta1.Finding.State;
 import com.google.cloud.securitycenter.v1beta1.ListAssetsResponse.ListAssetsResult;
 import com.google.cloud.securitycenter.v1beta1.stub.SecurityCenterStub;
 import com.google.cloud.securitycenter.v1beta1.stub.SecurityCenterStubSettings;
diff --git a/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/stub/SecurityCenterStubSettings.java b/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/stub/SecurityCenterStubSettings.java
index 40b734310c72..3e7a4641f0ca 100644
--- a/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/stub/SecurityCenterStubSettings.java
+++ b/google-cloud-clients/google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1beta1/stub/SecurityCenterStubSettings.java
@@ -382,7 +382,9 @@ public String extractNextToken(GroupAssetsResponse payload) {
 
             @Override
             public Iterable<GroupResult> extractResources(GroupAssetsResponse payload) {
-              return payload.getGroupByResultsList();
+              return payload.getGroupByResultsList() != null
+                  ? payload.getGroupByResultsList()
+                  : ImmutableList.<GroupResult>of();
             }
           };
 
@@ -416,7 +418,9 @@ public String extractNextToken(GroupFindingsResponse payload) {
 
             @Override
             public Iterable<GroupResult> extractResources(GroupFindingsResponse payload) {
-              return payload.getGroupByResultsList();
+              return payload.getGroupByResultsList() != null
+                  ? payload.getGroupByResultsList()
+                  : ImmutableList.<GroupResult>of();
             }
           };
 
@@ -453,7 +457,9 @@ public String extractNextToken(ListAssetsResponse payload) {
             @Override
             public Iterable<ListAssetsResponse.ListAssetsResult> extractResources(
                 ListAssetsResponse payload) {
-              return payload.getListAssetsResultsList();
+              return payload.getListAssetsResultsList() != null
+                  ? payload.getListAssetsResultsList()
+                  : ImmutableList.<ListAssetsResponse.ListAssetsResult>of();
             }
           };
 
@@ -487,7 +493,9 @@ public String extractNextToken(ListFindingsResponse payload) {
 
             @Override
             public Iterable<Finding> extractResources(ListFindingsResponse payload) {
-              return payload.getFindingsList();
+              return payload.getFindingsList() != null
+                  ? payload.getFindingsList()
+                  : ImmutableList.<Finding>of();
             }
           };
 
@@ -521,7 +529,9 @@ public String extractNextToken(ListSourcesResponse payload) {
 
             @Override
             public Iterable<Source> extractResources(ListSourcesResponse payload) {
-              return payload.getSourcesList();
+              return payload.getSourcesList() != null
+                  ? payload.getSourcesList()
+                  : ImmutableList.<Source>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java
index cd1c1c9856b1..4322a27d5b30 100644
--- a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java
+++ b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java
@@ -26,7 +26,6 @@
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.InvalidArgumentException;
 import com.google.api.gax.rpc.StatusCode;
-import com.google.cloud.securitycenter.v1beta1.Finding.State;
 import com.google.common.collect.Lists;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.Policy;