Index: src/main/java/org/apache/hadoop/hbase/client/HTablePool.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HTablePool.java (revision 1088470) +++ src/main/java/org/apache/hadoop/hbase/client/HTablePool.java (working copy) @@ -137,10 +137,12 @@ */ public void closeTablePool(final String tableName) { Queue queue = tables.get(tableName); - HTableInterface table = queue.poll(); - while (table != null) { - this.tableFactory.releaseHTableInterface(table); - table = queue.poll(); + if (queue != null) { + HTableInterface table = queue.poll(); + while (table != null) { + this.tableFactory.releaseHTableInterface(table); + table = queue.poll(); + } } HConnectionManager.deleteConnection(this.config, true); }