diff --git a/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java
index 76f2c38..8c9cfcf 100644
--- a/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java
@@ -107,8 +107,13 @@
         if (state != null && !state.equals("any")) {
             s = GroupState.valueOf(state.toUpperCase());
         }
-        Iterable<Device> devices = (uri == null) ? deviceService.getDevices() :
-                Collections.singletonList(deviceService.getDevice(DeviceId.deviceId(uri)));
+        Iterable<Device> devices = deviceService.getDevices();
+        if (uri != null) {
+            Device dev = deviceService.getDevice(DeviceId.deviceId(uri));
+            if (dev != null) {
+                devices = Collections.singletonList(dev);
+            }
+        }
         for (Device d : devices) {
             if (s == null) {
                 groups = newArrayList(groupService.getGroups(d.id()));