Index: src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java (revision 1379686) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java (working copy) @@ -280,7 +280,8 @@ public static boolean isEnabledTable(final ZooKeeperWatcher zkw, final String tableName) throws KeeperException { - return getTableState(zkw, tableName) == TableState.ENABLED; + TableState state = getTableState(zkw, tableName); + return state == null || state == TableState.ENABLED; } public boolean isDisablingOrDisabledTable(final String tableName) {