Index: hbase-server/src/main/ruby/shell/commands.rb =================================================================== --- hbase-server/src/main/ruby/shell/commands.rb (revision 1522998) +++ hbase-server/src/main/ruby/shell/commands.rb (working copy) @@ -90,8 +90,8 @@ rescue org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException valid_cols = table(args.first).get_all_columns.map { |c| c + '*' } raise "Unknown column family! Valid column names: #{valid_cols.join(", ")}" - rescue org.apache.hadoop.hbase.TableExistsException => e - raise "Table already exists: #{e.message}!" + rescue org.apache.hadoop.hbase.TableExistsException + raise "Table already exists: #{args.first}!" end end end 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 1522998) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -2880,7 +2880,7 @@ public void cloneSnapshot(final String snapshotName, final TableName tableName) throws IOException, TableExistsException, RestoreSnapshotException, InterruptedException { if (tableExists(tableName)) { - throw new TableExistsException("Table '" + tableName + " already exists"); + throw new TableExistsException(tableName); } internalRestoreSnapshot(snapshotName, tableName); waitUntilTableIsEnabled(tableName);