diff --git a/hydrabot/commands.js b/hydrabot/commands.js
index 62dabda82..1ff5b9b80 100644
--- a/hydrabot/commands.js
+++ b/hydrabot/commands.js
@@ -240,7 +240,7 @@ Commands[ "avatar" ] = {
 	oplevel: 0,
 	fn: function( bot, params, message ) {
 
-		var user = getUser( message, params );
+		var user = getUser( message, params, bot );
 
 		if ( !user.avatar ) {
 			bot.sendMessage( message.channel, user.mention() + " does not have an avatar!" );
@@ -442,11 +442,15 @@ function setAuthLevel( user, level ) {
 	Authority.setLevel( user, level );
 }
 
-function getUser( message, params ) {
+function getUser( message, params, bot ) {
 	var usr = false;
 	if ( !message.isPM() ) {
 		var wantedUser = getKey( params, "user", false ) || getKey( params, "u", false );
 		if ( wantedUser ) {
+			if(bot){
+				console.log(bot.getUsers().length());
+				return bot.getUsers().filter("username", wantedUser);
+			}
 			usr = message.channel.server.members.filter( Discord.isUserID( wantedUser ) ? "id" : "username", wantedUser, true );
 		}
 	}
diff --git a/index.js b/index.js
index 135623254..ab3f46292 100644
--- a/index.js
+++ b/index.js
@@ -280,9 +280,15 @@ exports.Client.prototype.login = function( email, password, callback, noCache )
 	self.connectWebsocket();
 
 	if ( this.tokenManager.exists( email ) && !noCache ) {
-		done( this.tokenManager.getToken( email, password ) );
-		self.debug("loaded token from caches in "+tp(globalLoginTime));
-		return;
+
+		var token = this.tokenManager.getToken( email, password );
+		if(!token.match(/[^\w.-]+/g)){
+			done( this.tokenManager.getToken( email, password ) );
+			self.debug("loaded token from caches in "+tp(globalLoginTime));
+			return;
+		}else{
+			self.debug("error getting token from caches, using default auth");
+		}
 	}
 
 	var time = Date.now();
@@ -305,6 +311,7 @@ exports.Client.prototype.login = function( email, password, callback, noCache )
 	} );
 
 	function done( token ) {
+		self.debug("using token " + token);
 		self.token = token;
 		self.websocket.sendData();
 		self.loggedIn = true;
diff --git a/lib/TokenManager.js b/lib/TokenManager.js
index 7b2853390..ceeed9ded 100644
--- a/lib/TokenManager.js
+++ b/lib/TokenManager.js
@@ -14,11 +14,7 @@ exports.TokenManager = function( folder, file ) {
 		var fd = fs.openSync( self.path, "wx" );
 		self.writeTokens();
 	} catch ( e ) {
-		if ( e.errno !== -4075 ) {
-			throw e;
-		} else {
-			self.readTokens();
-		}
+		self.readTokens();
 	}
 
 }
diff --git a/package.json b/package.json
index e980442b3..b88449b6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "discord.js",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "A way to interface with the Discord API",
   "main": "index.js",
   "scripts": {