diff --git a/api/src/main/java/io/grpc/NameResolver.java b/api/src/main/java/io/grpc/NameResolver.java
index 62ec4d167a..cfe2e934c0 100644
--- a/api/src/main/java/io/grpc/NameResolver.java
+++ b/api/src/main/java/io/grpc/NameResolver.java
@@ -73,7 +73,9 @@ public abstract class NameResolver {
   public abstract String getServiceAuthority();
 
   /**
-   * Starts the resolution.
+   * Starts the resolution. The method is not supposed to throw any exceptions. That might cause the
+   * Channel that the name resolver is serving to crash. Errors should be propagated
+   * through {@link Listener#onError}.
    *
    * @param listener used to receive updates on the target
    * @since 1.0.0
@@ -97,7 +99,9 @@ public abstract class NameResolver {
   }
 
   /**
-   * Starts the resolution.
+   * Starts the resolution. The method is not supposed to throw any exceptions. That might cause the
+   * Channel that the name resolver is serving to crash. Errors should be propagated
+   * through {@link Listener2#onError}.
    *
    * @param listener used to receive updates on the target
    * @since 1.21.0