diff --git a/index.js b/index.js
index 679a122..bef704f 100644
--- a/index.js
+++ b/index.js
@@ -232,10 +232,12 @@ passport.deserializeUser(Account.deserializeUser());
 
 var accessTokenStrategy = new PassportOAuthBearer(function(token, done) {
 	oauthModels.AccessToken.findOne({ token: token }).populate('user').populate('grant').exec(function(error, token) {
-		// console.log("db token: " + token.active);
-		// console.log("db token.grant : " + token.grant.active);
-		// console.log("db token.user: " + token.user);
-		if (token && token.active && token.grant.active && token.user) {
+		if (!error) {
+			// console.log("db token: " + token.active);
+			// console.log("db token.grant : " + token.grant.active);
+			// console.log("db token.user: " + token.user);
+		}
+		if (!error && token && token.active && token.grant.active && token.user) {
 			// console.log("Token is GOOD!");
 			done(null, token.user, { scope: token.scope });
 		} else if (!error) {
diff --git a/oauth.js b/oauth.js
index d9c444a..588cb07 100644
--- a/oauth.js
+++ b/oauth.js
@@ -45,7 +45,8 @@ server.exchange(oauth2orize.exchange.code({
 					OAuth.RefreshToken.findOne({application:application, user: grant.user},function(error, refreshToken){
 						if (refreshToken){
 							var expires = Math.round((token.expires - (new Date().getTime()))/1000);
-							done(null,token.token, refreshToken.token,{token_type: 'Bearer', expires_in: expires, scope: token.scope});
+							done(null,token.token, refreshToken.token,{token_type: 'Bearer', expires_in: expires});
+							console.log("sent expires_in: " + expires);
 						} else {
 							// Shouldn't get here unless there is an error as there
 							// should be a refresh token if there is an access token