diff --git a/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java b/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
index 8b483843a8cb..bc9053c59f2e 100644
--- a/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
+++ b/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
@@ -539,11 +539,12 @@ long acquireLock() throws UnknownHostException, TException, InterruptedException
                 LockState newState = response.getState();
                 state.set(newState);
                 if (newState.equals(LockState.WAITING)) {
-                  throw new WaitingForLockException("Waiting for lock.");
+                  throw new WaitingForLockException(
+                          String.format("Waiting for lock on table %s.%s", database, tableName));
                 }
               } catch (InterruptedException e) {
                 Thread.interrupted(); // Clear the interrupt status flag
-                LOG.warn("Interrupted while waiting for lock.", e);
+                LOG.warn("Interrupted while waiting for lock on table {}.{}", database, tableName, e);
               }
             }, TException.class);
       }