diff --git a/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java b/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java
index 7ad76c6118..fa3171e5a1 100644
--- a/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java
+++ b/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java
@@ -22,7 +22,6 @@ import java.util.Map;
 
 import javax.annotation.Nullable;
 
-import com.google.common.base.Predicate;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.options.RunScriptOptions;
 import org.jclouds.compute.util.ComputeUtils;
diff --git a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
index 756732edf0..02d7e1b057 100755
--- a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
@@ -339,7 +339,7 @@ public abstract class BaseComputeServiceLiveTest {
 
    @Test(enabled = true, dependsOnMethods = "testGet")
    public void testReboot() throws Exception {
-      client.rebootNodesWithTag(tag);
+      client.rebootNodesWithTag(tag);// TODO test validation
       testGet();
    }
 
diff --git a/extensions/ssh/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java b/extensions/ssh/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
index 26e018adaa..165fd03aa3 100644
--- a/extensions/ssh/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
+++ b/extensions/ssh/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
@@ -162,11 +162,14 @@ public class JschSshClient implements SshClient {
    @PostConstruct
    public void connect() {
       disconnect();
+      Exception e = null;
       RETRY_LOOP: for (int i = 0; i < sshRetries; i++) {
          try {
             newSession();
+            e = null;
             break RETRY_LOOP;
          } catch (Exception from) {
+            e = from;
             disconnect();
             String rootMessage = Throwables.getRootCause(from).getMessage();
             if (i == sshRetries)
@@ -190,6 +193,8 @@ public class JschSshClient implements SshClient {
             throw propagate(from);
          }
       }
+      if (e != null)
+         throw propagate(e);
    }
 
    private void newSession() throws JSchException {