From fa0c7c3f40f3a031ae6fa8eb8bb625a35beecfe7 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 9 Feb 2016 19:21:14 -0400
Subject: [PATCH] Only throw an exception if a TaskManager cancel was
 unexpected

---
 src/Discord.Net/TaskManager.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net/TaskManager.cs b/src/Discord.Net/TaskManager.cs
index 7c9a667ce..d43372396 100644
--- a/src/Discord.Net/TaskManager.cs
+++ b/src/Discord.Net/TaskManager.cs
@@ -162,7 +162,10 @@ namespace Discord
         public void ThrowException()
         {
             using (_lock.Lock())
-                _stopReason?.Throw();
+            {
+                if (!WasStopExpected)
+                    _stopReason?.Throw();
+            }
         }
         public void ClearException()
         {