1 files changed, 3 insertions, 2 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java
index 7c2361da3..45c2acf16 100644
--- a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java
@@ -76,9 +76,10 @@ public class GroupFindCLI extends CLI {
 
         GroupCollection response = groupCLI.groupClient.findGroups(filter, start, size);
 
-        Collection<GroupData> entries = response.getGroups();
+        Collection<GroupData> entries = response.getEntries();
 
-        MainCLI.printMessage(entries.size()+" group(s) matched");
+        MainCLI.printMessage(response.getTotal() + " group(s) matched");
+        if (response.getTotal() == 0) return;
 
         boolean first = true;