diff --git a/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java b/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java
index dc007b2d6..16d3bfc0a 100644
--- a/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java
+++ b/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java
@@ -27,6 +27,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 public class PubSub {
 
@@ -332,7 +333,7 @@ public void onConnectionResumed(boolean sessionPresent) {
                 int count = 0;
                 while (count++ < messagesToPublish) {
                     CompletableFuture<Integer> published = connection.publish(new MqttMessage(topic, message.getBytes(), QualityOfService.AT_LEAST_ONCE, false));
-                    published.get();
+                    published.get(10, TimeUnit.SECONDS);
                     Thread.sleep(1000);
                 }
                 
diff --git a/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java b/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java
index 872c52c41..3473b2c22 100644
--- a/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java
+++ b/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java
@@ -122,7 +122,7 @@ public void run() {
                 @Override
                 public void run() {
                     /* Show the warning that the table is CREATING/DELETING/UPDATING */
-                    MessageDialog dialog = new MessageDialog(
+                    try (MessageDialog dialog = new MessageDialog(
                             Display.getCurrent().getActiveShell(),
                             "Cannot open this table",
                             AwsToolkitCore.getDefault()
@@ -130,8 +130,9 @@ public void run() {
                                     .get(AwsToolkitCore.IMAGE_AWS_ICON),
                             "Cannot open this table(" + tableName + "), since it is in the status of " + tableStatus + ".",
                             MessageDialog.ERROR,
-                            new String[] { "OK" }, 0);
-                    dialog.open();
+                            new String[] { "OK" }, 0)) {
+                        dialog.open();
+                    }                    
                 }
             });
         }