diff --git a/modules/nickserv/nickserv.js b/modules/nickserv/nickserv.js
index f170102..d7cb267 100644
--- a/modules/nickserv/nickserv.js
+++ b/modules/nickserv/nickserv.js
@@ -13,9 +13,11 @@ var nickserv = function(dbot) {
             this.authStack[server][nick] = callback;
             dbot.say(server, nickserv, infoCommand + ' ' + nick + ' *');
             setTimeout(function() {
-                delete this.authStack[server][nick];
-                callback(false);
-            }, 4000)
+                if(_.has(this.userStack[server], nick)) {
+                    delete this.authStack[server][nick];
+                    callback(false);
+                }
+            }, 4000);
         },
 
         'getUserHost': function(server, nick, callback) {