From 9088ed8b3b0babbd41503305558f6aec782ed441 Mon Sep 17 00:00:00 2001
From: Greg Beaty <gregbeatyjr@gmail.com>
Date: Fri, 28 Jun 2019 00:47:36 -0400
Subject: [PATCH] Destructure the correct error object

The incorrect error was being returned instead of the one that was returned from `formatError`.
---
 CHANGELOG.md  | 2 ++
 src/server.ts | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78fd79bb2..17defd12d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
   [@benjie](https://github.com/benjie) in [#514](https://github.com/apollographql/subscriptions-transport-ws/pull/514)
 - Fix invalid `formatResponse` console error.  <br/>
   [@renatorib](https://github.com/renatorib) in [#761](https://github.com/apollographql/subscriptions-transport-ws/pull/761)
+- Destructure the correct error object in `MessageTypes.GQL_START`.  <br/>
+  [@gregbty](https://github.com/gregbty) in [#588](https://github.com/apollographql/subscriptions-transport-ws/pull/588)
 
 ### New Features
 
diff --git a/src/server.ts b/src/server.ts
index 573c9df10..fb7c6775b 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -400,8 +400,8 @@ export class SubscriptionServer {
                   }
 
                   // plain Error object cannot be JSON stringified.
-                  if (Object.keys(e).length === 0) {
-                    error = { name: e.name, message: e.message };
+                  if (Object.keys(error).length === 0) {
+                    error = { name: error.name, message: error.message };
                   }
 
                   this.sendError(connectionContext, opId, error);