Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (revision 1521192) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (working copy) @@ -367,7 +367,17 @@ assertTrue(exceptionThrown); } } - /** + + @Test + public void testIsEnabledOnNonexistentTable() throws IOException { + try { + admin.isTableEnabled(Bytes.toBytes("non-existing")); + assertFalse(true); + } catch (TableNotFoundException e) { + } + } + + /** * Verify schema modification takes. * @throws IOException * @throws InterruptedException Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1521192) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -1011,6 +1011,9 @@ } public boolean isTableEnabled(byte[] tableName) throws IOException { + if (!tableExists(tableName)) { + throw new TableNotFoundException(tableName); + } return isTableEnabled(TableName.valueOf(tableName)); }