diff --git a/CHANGES.txt b/CHANGES.txt
index 796011a902..a38ccf3d1c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1023,6 +1023,10 @@ Release 0.21.0 - Unreleased
 
   BUG FIXES
 
+    HADOOP-6819. [Herriot] Shell command for getting the new exceptions in
+    the logs returning exitcode 1 after executing successfully. (Vinay Thota
+    via cos)
+
     HADOOP-6847. Problem staging 0.21.0 artifacts to Apache Nexus Maven
     Repository (Giridharan Kesavan via cos)
 
diff --git a/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj b/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
index 23860d2bfb..3f49dbf08a 100644
--- a/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
+++ b/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
@@ -264,7 +264,7 @@ public aspect DaemonProtocolAspect {
         if (index++ < list.length -1) {
            filterExpPattern.append("grep -v " + excludeExp + " | ");
         } else {
-           filterExpPattern.append("grep -vc " + excludeExp);
+           filterExpPattern.append("grep -v " + excludeExp + " | wc -l");
         }
       }
       cmd = new String[] {