diff --git a/index.js b/index.js
index 9d0e7dd70c..6ec5ab3b7a 100644
--- a/index.js
+++ b/index.js
@@ -182,6 +182,10 @@ RedisClient.prototype.do_auth = function () {
                     self.do_auth();
                 }, 2000); // TODO - magic number alert
                 return;
+            } else if (err.toString().match("no password is set")) {
+                console.log("Warning: Redis server does not require a password, but a password was supplied.")
+                err = null;
+                res = "OK";
             } else {
                 return self.emit("error", new Error("Auth error: " + err.message));
             }