diff --git a/ams/server/src/main/java/com/netease/arctic/server/persistence/NestedSqlSession.java b/ams/server/src/main/java/com/netease/arctic/server/persistence/NestedSqlSession.java
index e8b322e562..cfa5735375 100644
--- a/ams/server/src/main/java/com/netease/arctic/server/persistence/NestedSqlSession.java
+++ b/ams/server/src/main/java/com/netease/arctic/server/persistence/NestedSqlSession.java
@@ -75,7 +75,7 @@ public void close() {
     } else if (nestCount == 0 && sqlSession != null) {
       sqlSession.close();
       sqlSession = null;
-      sessions.set(null);
+      sessions.remove();
       nestCount = -1;
     }
   }
diff --git a/core/src/main/java/com/netease/arctic/optimizing/BaseOptimizingInput.java b/core/src/main/java/com/netease/arctic/optimizing/BaseOptimizingInput.java
index ed414b2850..47cb4727da 100644
--- a/core/src/main/java/com/netease/arctic/optimizing/BaseOptimizingInput.java
+++ b/core/src/main/java/com/netease/arctic/optimizing/BaseOptimizingInput.java
@@ -34,7 +34,7 @@ public void option(String name, String value) {
 
   @Override
   public void options(Map<String, String> options) {
-    options.putAll(options);
+    this.options.putAll(options);
   }
 
   @Override
diff --git a/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index be1a6650f6..711a3c4bfa 100644
--- a/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ b/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -515,7 +515,7 @@ private void open() throws MetaException {
           LOG.info("Waiting " + retryDelaySeconds + " seconds before next connection attempt.");
           Thread.sleep(retryDelaySeconds * 1000);
         } catch (InterruptedException ignore) {
-          ignore.printStackTrace();
+          LOG.warn("Unexpected InterruptedException while waiting between connection retries.", ignore);
         }
       }
     }
@@ -2310,7 +2310,7 @@ public NotificationEventResponse getNextNotification(
       return rsp;
     } else {
       NotificationEventResponse filtered = new NotificationEventResponse();
-      if (rsp != null && rsp.getEvents() != null) {
+      if (rsp.getEvents() != null) {
         for (NotificationEvent e : rsp.getEvents()) {
           if (filter.accept(e)) {
             filtered.addToEvents(e);