diff --git a/src/java/org/apache/nutch/crawl/Generator.java b/src/java/org/apache/nutch/crawl/Generator.java
index 456ba689a9..ede24f869b 100644
--- a/src/java/org/apache/nutch/crawl/Generator.java
+++ b/src/java/org/apache/nutch/crawl/Generator.java
@@ -974,10 +974,13 @@ public Path[] generate(Path dbDir, Path segments, int numLists, long topN,
     }
 
     LOG.info("Generator: number of items rejected during selection:");
-    for (Counter counter : job.getCounters().getGroup("Generator")) {
-      LOG.info("Generator: {}  {}",
-          String.format(Locale.ROOT, "%6d", counter.getValue()),
-          counter.getName());
+    for (Counter counter : job.getCounters()
+        .getGroup(NutchMetrics.GROUP_GENERATOR)) {
+      long counterValue = counter.getValue();
+      if (counterValue > 0) {
+        LOG.info("Generator: {}  {}",
+            String.format(Locale.ROOT, "%6d", counterValue), counter.getName());
+      }
     }
     if (!getConf().getBoolean(GENERATE_UPDATE_CRAWLDB, false)) {
       /*
diff --git a/src/java/org/apache/nutch/indexer/IndexingJob.java b/src/java/org/apache/nutch/indexer/IndexingJob.java
index fc2c44a064..224b4118e6 100644
--- a/src/java/org/apache/nutch/indexer/IndexingJob.java
+++ b/src/java/org/apache/nutch/indexer/IndexingJob.java
@@ -30,6 +30,7 @@
 
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.nutch.metadata.Nutch;
+import org.apache.nutch.metrics.NutchMetrics;
 import org.apache.nutch.segment.SegmentChecker;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
@@ -155,10 +156,14 @@ public void index(Path crawlDb, Path linkDb, List<Path> segments,
         throw e;
       }
       LOG.info("Indexer: number of documents indexed, deleted, or skipped:");
-      for (Counter counter : job.getCounters().getGroup("IndexerStatus")) {
-        LOG.info("Indexer: {}  {}",
-            String.format(Locale.ROOT, "%6d", counter.getValue()),
-            counter.getName());
+      for (Counter counter : job.getCounters()
+          .getGroup(NutchMetrics.GROUP_INDEXER)) {
+        long counterValue = counter.getValue();
+        if (counterValue > 0) {
+          LOG.info("Indexer: {}  {}",
+              String.format(Locale.ROOT, "%6d", counterValue),
+              counter.getName());
+        }
       }
       stopWatch.stop();
       LOG.info("Indexer: finished, elapsed: {} ms", stopWatch.getTime(