diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6279653..ac97f07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.7
+
+* When a `Client` is closed before a request completes, the error sent to that
+  request's `Future` now includes the request method to aid in debugging.
+
 ## 2.0.6
 
 * Internal changes only.
diff --git a/lib/src/client.dart b/lib/src/client.dart
index 3607c4a..ff5c803 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -65,7 +65,8 @@
     _manager.done.whenComplete(() {
       for (var request in _pendingRequests.values) {
         request.completer.completeError(
-            new StateError("The client closed with pending requests."),
+            new StateError(
+                'The client closed with pending request "${request.method}".'),
             StackTrace.current);
       }
       _pendingRequests.clear();
@@ -106,7 +107,7 @@
     _send(method, parameters, id);
 
     var completer = new Completer.sync();
-    _pendingRequests[id] = new _Request(completer, new Chain.current());
+    _pendingRequests[id] = new _Request(method, completer, new Chain.current());
     return completer.future;
   }
 
@@ -213,11 +214,14 @@
 
 /// A pending request to the server.
 class _Request {
+  /// THe method that was sent.
+  final String method;
+
   /// The completer to use to complete the response future.
   final Completer completer;
 
   /// The stack chain from where the request was made.
   final Chain chain;
 
-  _Request(this.completer, this.chain);
+  _Request(this.method, this.completer, this.chain);
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index b841c4d..3b4f993 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: json_rpc_2
-version: 2.0.6
+version: 2.0.7
 author: Dart Team <misc@dartlang.org>
 description: An implementation of the JSON-RPC 2.0 spec.
 homepage: http://github.com/dart-lang/json_rpc_2