diff --git a/examples/pom.xml b/examples/pom.xml
index ffd8b5f6..5f48cb9f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.hierynomus</groupId>
             <artifactId>sshj</artifactId>
-            <version>0.19.0</version>
+            <version>0.24.0</version>
         </dependency>
     </dependencies>
 
diff --git a/examples/src/main/java/net/schmizz/sshj/examples/Exec.java b/examples/src/main/java/net/schmizz/sshj/examples/Exec.java
index 9fa3c632..0f89114c 100644
--- a/examples/src/main/java/net/schmizz/sshj/examples/Exec.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/Exec.java
@@ -5,28 +5,32 @@ import net.schmizz.sshj.common.IOUtils;
 import net.schmizz.sshj.connection.channel.direct.Session;
 import net.schmizz.sshj.connection.channel.direct.Session.Command;
 
+import java.io.Console;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 /** This examples demonstrates how a remote command can be executed. */
 public class Exec {
+    private static final Console con = System.console();
 
     public static void main(String... args)
             throws IOException {
         final SSHClient ssh = new SSHClient();
         ssh.loadKnownHosts();
-
         ssh.connect("localhost");
+        Session session = null;
         try {
             ssh.authPublickey(System.getProperty("user.name"));
-            final Session session = ssh.startSession();
+            session = ssh.startSession();
             final Command cmd = session.exec("ping -c 1 google.com");
-            System.out.println(IOUtils.readFully(cmd.getInputStream()).toString());
+            con.writer().print(IOUtils.readFully(cmd.getInputStream()).toString());
             cmd.join(5, TimeUnit.SECONDS);
-            System.out.println("\n** exit status: " + cmd.getExitStatus());
+            con.writer().print("\n** exit status: " + cmd.getExitStatus());
         } finally {
             try {
-                session.close();
+                if (session != null) {
+                    session.close();
+                }
             } catch (IOException e) {
                 // Do Nothing   
             }
diff --git a/src/main/java/net/schmizz/sshj/common/Buffer.java b/src/main/java/net/schmizz/sshj/common/Buffer.java
index 7c420fcb..d97cf636 100644
--- a/src/main/java/net/schmizz/sshj/common/Buffer.java
+++ b/src/main/java/net/schmizz/sshj/common/Buffer.java
@@ -147,7 +147,6 @@ public class Buffer<T extends Buffer<T>> {
 
     /** Compact this {@link SSHPacket} */
     public void compact() {
-        System.err.println("COMPACTING");
         if (available() > 0)
             System.arraycopy(data, rpos, data, 0, wpos - rpos);
         wpos -= rpos;
@@ -356,8 +355,9 @@ public class Buffer<T extends Buffer<T>> {
     }
 
     public T putUInt64(long uint64) {
-        if (uint64 < 0)
+        if (uint64 < 0) {
             throw new IllegalArgumentException("Invalid value: " + uint64);
+        }
         return putUInt64Unchecked(uint64);
     }
 
diff --git a/src/main/java/net/schmizz/sshj/transport/Reader.java b/src/main/java/net/schmizz/sshj/transport/Reader.java
index f39aa15d..2d682011 100644
--- a/src/main/java/net/schmizz/sshj/transport/Reader.java
+++ b/src/main/java/net/schmizz/sshj/transport/Reader.java
@@ -60,10 +60,8 @@ public final class Reader
                 }
             }
         } catch (Exception e) {
-            //noinspection StatementWithEmptyBody
-            if (isInterrupted()) {
-                // We are meant to shut up and draw to a close if interrupted
-            } else {
+            // We are meant to shut up and draw to a close if interrupted
+            if (!isInterrupted()) {
                 trans.die(e);
             }
         }
diff --git a/src/test/java/com/hierynomus/sshj/sftp/RemoteFileTest.java b/src/test/java/com/hierynomus/sshj/sftp/RemoteFileTest.java
index 30b84d1e..3436af42 100644
--- a/src/test/java/com/hierynomus/sshj/sftp/RemoteFileTest.java
+++ b/src/test/java/com/hierynomus/sshj/sftp/RemoteFileTest.java
@@ -71,9 +71,7 @@ public class RemoteFileTest {
             n += rs.read(test, n, 3072 - n);
         }
 
-        if (test[3072] != 0) {
-            System.err.println("buffer overrun!");
-        }
+        assertThat("buffer overrun", test[3072] == 0);
 
         n += rs.read(test, n, test.length - n); // --> ArrayIndexOutOfBoundsException
 
diff --git a/src/test/java/net/schmizz/sshj/LoadsOfConnects.java b/src/test/java/net/schmizz/sshj/LoadsOfConnects.java
index 126a2498..67adf304 100644
--- a/src/test/java/net/schmizz/sshj/LoadsOfConnects.java
+++ b/src/test/java/net/schmizz/sshj/LoadsOfConnects.java
@@ -22,6 +22,8 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
+import static org.junit.Assert.fail;
+
 public class LoadsOfConnects {
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
@@ -29,15 +31,19 @@ public class LoadsOfConnects {
     private final SshFixture fixture = new SshFixture();
 
     @Test
-    public void loadsOfConnects()
-            throws IOException, InterruptedException {
-        for (int i = 0; i < 1000; i++) {
-            System.out.println("Try " + i);
-            fixture.start();
-            fixture.setupConnectedDefaultClient();
-            fixture.stopClient();
-            fixture.stopServer();
+    public void loadsOfConnects() {
+        try {
+            for (int i = 0; i < 1000; i++) {
+                log.info("Try " + i);
+                fixture.start();
+                fixture.setupConnectedDefaultClient();
+                fixture.stopClient();
+                fixture.stopServer();
+            }
+        } catch (Exception e) {
+            fail(e.getMessage());
         }
+
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java b/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java
index cc60399a..0465d751 100644
--- a/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java
+++ b/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java
@@ -251,10 +251,10 @@ public class OpenSSHKeyFileTest {
     }
 
     @Before
-    public void setup()
-            throws UnsupportedEncodingException, GeneralSecurityException {
-        if (!SecurityUtils.isBouncyCastleRegistered())
+    public void checkBCRegistration() {
+        if (!SecurityUtils.isBouncyCastleRegistered()) {
             throw new AssertionError("bouncy castle needed");
+        }
     }
 
     private String readFile(String pathname)