diff --git a/client/src/main/java/io/pravega/client/stream/impl/ControllerResolverFactory.java b/client/src/main/java/io/pravega/client/stream/impl/ControllerResolverFactory.java
index <HASH>..<HASH> 100644
--- a/client/src/main/java/io/pravega/client/stream/impl/ControllerResolverFactory.java
+++ b/client/src/main/java/io/pravega/client/stream/impl/ControllerResolverFactory.java
@@ -188,7 +188,9 @@ public class ControllerResolverFactory extends NameResolver.Factory {
         public void shutdown() {
             if (!shutdown) {
                 log.info("Shutting down ControllerNameResolver");
-                this.scheduledExecutor.shutdownNow();
+                if (this.scheduledExecutor != null) {
+                    this.scheduledExecutor.shutdownNow();
+                }
                 shutdown = true;
             }
         }
Issue <I>: NPE during shutdown of ControllerNameResolver (#<I>)

* Checks for null before ControllerNameResolver#shutdown.