diff --git a/lib/link.js b/lib/link.js
index 801966b..42af700 100644
--- a/lib/link.js
+++ b/lib/link.js
@@ -185,13 +185,12 @@ Link.prototype.addCredits = function(credits, flowOptions) {
 
   var self = this;
   return new Promise(function(resolve, reject) {
+    var onError = function(err) { reject(err); };
+    self.once(Link.ErrorReceived, onError);
     self.once(Link.CreditChange, function() {
+      self.removeListener(Link.ErrorReceived, onError);
       resolve();
     });
-
-    self.once(Link.ErrorReceived, function(error) {
-      reject(error);
-    });
   });
 };