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 1507538) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (working copy) @@ -366,7 +366,16 @@ assertTrue(exceptionThrown); } } - /** + + @Test + public void testIsEnabledOnNonexistentTable() throws IOException { + try { + assertFalse(admin.isTableEnabled(Bytes.toBytes("non-existing"))); + } catch (IOException 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 1507538) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -941,6 +941,9 @@ if (!HTableDescriptor.isMetaTable(tableName)) { HTableDescriptor.isLegalTableName(tableName); } + if (!tableExists(tableName)){ + return false; + } return connection.isTableEnabled(tableName); }