diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java
index 199038a751226..979c630749d29 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java
@@ -114,7 +114,9 @@ private static String buildDescription(ExpressionFactory factory) {
       if (expr.isOperator()) {
         operators.add(expr);
       } else {
-        primaries.add(expr);
+        if (expr != null) {
+          primaries.add(expr);
+        }
       }
     }
     Collections.sort(operators, new Comparator<Expression>() {
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java
index eef44617ce376..8f4004eb08474 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java
@@ -420,7 +420,10 @@ public int solve(int[] prefix, SolutionAcceptor<ColumnName> output) {
     }
     int result = search(choices, output);
     for(int i=prefix.length-1; i >=0; --i) {
-      rollback(choices.get(i));
+      Node<ColumnName> choice = choices.get(i);
+      if (choice != null) {
+        rollback(choice);
+      }
     }
     return result;
   }
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java
index e4c9ef6de8ba3..b5d37e8b3154d 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java
@@ -415,8 +415,11 @@ private Pair<Long, Long> dumpStoreEntries(
       }
       List<DirListingMetadata> childMD = new ArrayList<>(childDirs.size());
       for (DDBPathMetadata childDir : childDirs) {
-        childMD.add(getStore().listChildren(
-            childDir.getFileStatus().getPath()));
+        DirListingMetadata data = getStore().listChildren(
+            childDir.getFileStatus().getPath());
+        if (data != null) {
+            childMD.add(data);
+        }
       }
       pushAll(queue, childMD);
     }