diff --git a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
index abec1151f016..e91e76090abf 100644
--- a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
+++ b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
@@ -185,7 +185,7 @@ private void handleClusterDiscovered() {
       }
       LoadBalancerProvider lbProvider = null;
       Object lbConfig = null;
-      if (root.result != null && root.result.lbPolicy() == LbPolicy.RING_HASH) {
+      if (root.result.lbPolicy() == LbPolicy.RING_HASH) {
         lbProvider = lbRegistry.getProvider("ring_hash");
         lbConfig = new RingHashConfig(root.result.minRingSize(), root.result.maxRingSize());
       } else {
diff --git a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
index 3ae6346c158a..732bd3e7d94e 100644
--- a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
+++ b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
@@ -644,6 +644,7 @@ private static boolean matchHeader(HeaderMatcher headerMatcher, @Nullable String
 
   @Nullable
   private static String getHeaderValue(Metadata headers, String headerName) {
+    checkNotNull(headerName, "headerName");
     if (headerName.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
       return null;
     }