diff --git a/src/main/java/org/qora/network/Network.java b/src/main/java/org/qora/network/Network.java
index cd3efea3..ab870af6 100644
--- a/src/main/java/org/qora/network/Network.java
+++ b/src/main/java/org/qora/network/Network.java
@@ -362,6 +362,9 @@ public class Network extends Thread {
 		if (!newPeer.connect())
 			return;
 
+		if (this.isInterrupted())
+			return;
+
 		synchronized (this.connectedPeers) {
 			this.connectedPeers.add(newPeer);
 		}
@@ -824,6 +827,11 @@ public class Network extends Thread {
 		peerExecutor.shutdownNow();
 
 		this.interrupt();
+		try {
+			this.join();
+		} catch (InterruptedException e) {
+			// We were interrupted while waiting for thread to join
+		}
 	}
 
 }