diff --git a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java
index 5a44d666c8f2..777fce58d494 100644
--- a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java
+++ b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java
@@ -222,7 +222,9 @@ public String extractNextToken(ListGroupStatsResponse payload) {
 
             @Override
             public Iterable<ErrorGroupStats> extractResources(ListGroupStatsResponse payload) {
-              return payload.getErrorGroupStatsList();
+              return payload.getErrorGroupStatsList() != null
+                  ? payload.getErrorGroupStatsList()
+                  : ImmutableList.<ErrorGroupStats>of();
             }
           };
 
@@ -256,7 +258,9 @@ public String extractNextToken(ListEventsResponse payload) {
 
             @Override
             public Iterable<ErrorEvent> extractResources(ListEventsResponse payload) {
-              return payload.getErrorEventsList();
+              return payload.getErrorEventsList() != null
+                  ? payload.getErrorEventsList()
+                  : ImmutableList.<ErrorEvent>of();
             }
           };