diff --git a/CHANGES.txt b/CHANGES.txt
index b28c15ba3af..803c7eb6c04 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -455,6 +455,8 @@ Release 0.92.0 - Unreleased
    HBASE-4745  LRU statistics thread should be a daemon
    HBASE-4749  TestMasterFailover#testMasterFailoverWithMockedRITOnDeadRS
                occasionally fails
+   HBASE-4753  org.apache.hadoop.hbase.regionserver.TestHRegionInfo#testGetSetOfHTD
+               throws NPE on trunk (nkeywal)
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected
diff --git a/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java b/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java
index b65849121d5..b2783aedbb0 100644
--- a/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java
+++ b/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java
@@ -430,7 +430,9 @@ public class FSTableDescriptors implements TableDescriptors {
     FileSystem fs = FSUtils.getCurrentFileSystem(conf);
     FileStatus status = getTableInfoPath(fs, FSUtils.getRootDir(conf), tableName);
     // The below deleteDirectory works for either file or directory.
-    if (fs.exists(status.getPath())) FSUtils.deleteDirectory(fs, status.getPath());
+    if (status != null && fs.exists(status.getPath()))  {
+      FSUtils.deleteDirectory(fs, status.getPath());
+    }
   }
 
   /**