diff --git a/lib/lock.js b/lib/lock.js
index <HASH>..<HASH> 100644
--- a/lib/lock.js
+++ b/lib/lock.js
@@ -99,6 +99,13 @@ Lock.prototype.acquire = function(key, fn) {
     lock.key = key;
 
     Lock._acquiredLocks[lock.id] = lock;
+  }).catch(function(err) {
+    // Wrap redis errors
+    if (!(err instanceof LockAcquisitionError)) {
+      err = new LockAcquisitionError(err.message);
+    }
+
+    throw err;
   }).nodeify(fn);
 };
 
@@ -132,6 +139,13 @@ Lock.prototype.release = function(fn) {
     }
 
     return Promise.resolve();
+  }).catch(function(err) {
+    // Wrap redis errors
+    if (!(err instanceof LockReleaseError)) {
+      err = new LockReleaseError(err.message);
+    }
+
+    throw err;
   }).nodeify(fn);
 };
Catch redis errors and convert to corresponding lock errors