diff --git a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
index <HASH>..<HASH> 100644
--- a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
+++ b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
@@ -178,8 +178,9 @@ final class XdsNameResolver extends NameResolver {
         //  a temporary solution. More design discussion needs to be done.
         if (error.getCode().equals(Code.NOT_FOUND)) {
           listener.onResult(ResolutionResult.newBuilder().build());
+          return;
         }
-        listener.onError(error);
+        listener.onError(Status.UNAVAILABLE.withDescription(error.getDescription()));
       }
     });
   }
xds: fix bug of return resolution error twice in xDS resolver (#<I>)