1 files changed, 5 insertions, 2 deletions
diff --git a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/DeviceSetControllersCommand.java b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/DeviceSetControllersCommand.java
index c3693799..cb4ff04a 100644
--- a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/DeviceSetControllersCommand.java
+++ b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/DeviceSetControllersCommand.java
@@ -59,8 +59,11 @@ public class DeviceSetControllersCommand extends AbstractShellCommand {
         ControllerConfig config = h.behaviour(ControllerConfig.class);
         print("before:");
         config.getControllers().forEach(c -> print(c.target()));
-
-        config.setControllers(newControllers);
+        try {
+            config.setControllers(newControllers);
+        } catch (NullPointerException e) {
+            print("No Device with requested parameters {} ", uri);
+        }
         print("after:");
         config.getControllers().forEach(c -> print(c.target()));
         print("size %d", config.getControllers().size());