From f25d35150dd8f681d40a41ffce5cf06da3ea506e Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Mon, 12 Oct 2015 00:33:41 -0300
Subject: [PATCH] Only join threads if they were made in the first place

---
 src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs b/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs
index 194fdbda7..b3777801c 100644
--- a/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs
+++ b/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs
@@ -167,8 +167,10 @@ namespace Discord.WebSockets.Voice
 		protected override Task Cleanup()
 		{
 #if USE_THREAD
-			_sendThread.Join();
-			_receiveThread.Join();
+			if (_sendThread != null)
+				_sendThread.Join();
+			if (_receiveThread != null)	
+				_receiveThread.Join();
 			_sendThread = null;
 			_receiveThread = null;
 #endif