diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
index 76af183f8..ac307f939 100644
--- a/projects/RabbitMQ.Client/client/impl/Connection.cs
+++ b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -374,17 +374,7 @@ await _session0.TransmitAsync(method, cancellationToken)
                 await _mainLoopTask.WaitAsync(timeout, cancellationToken)
                     .ConfigureAwait(false);
             }
-            catch (AggregateException)
-            {
-            }
-            // TODO timeout vs real cancellation?
-            catch (OperationCanceledException)
-            {
-            }
-            catch (TimeoutException)
-            {
-            }
-            finally
+            catch
             {
                 try
                 {
@@ -395,6 +385,11 @@ await _frameHandler.CloseAsync()
                 catch
                 {
                 }
+
+                if (false == abort)
+                {
+                    throw;
+                }
             }
         }