diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 4e5e12347169f..91834f237c4ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -2963,6 +2963,9 @@ public void removeBRLeaseIfNeeded(final DatanodeID nodeID,
     DatanodeDescriptor node;
     try {
       node = datanodeManager.getDatanode(nodeID);
+      if (node == null) {
+        throw new UnregisteredNodeException(nodeID, null);
+      }
       if (context != null) {
         if (context.getTotalRpcs() == context.getCurRpc() + 1) {
           long leaseId = this.getBlockReportLeaseManager().removeLease(node);