diff --git a/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java
index bf919a624a09..4f24e1ec4abd 100644
--- a/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java
+++ b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java
@@ -217,7 +217,9 @@ public String extractNextToken(ListTracesResponse payload) {
 
             @Override
             public Iterable<Trace> extractResources(ListTracesResponse payload) {
-              return payload.getTracesList();
+              return payload.getTracesList() != null
+                  ? payload.getTracesList()
+                  : ImmutableList.<Trace>of();
             }
           };