diff --git a/lib/github-auth.js b/lib/github-auth.js
index d971c4b..3347502 100644
--- a/lib/github-auth.js
+++ b/lib/github-auth.js
@@ -14,7 +14,7 @@ var githubUserTokens;
 var githubUserTokensFile = '.github-user-tokens.json';
 autosave(githubUserTokensFile, {data:[]}).then(function(f) {
   githubUserTokens = f;
-  for (var i = 0; i < githubUserTokens.length; i++) {
+  for (var i = 0; i < githubUserTokens.data.length; i++) {
     addGithubToken(githubUserTokens.data[i]);
   }
 }).catch(function(e) { console.error('Could not create ' + githubUserTokensFile); });
@@ -116,12 +116,12 @@ function sendTokenToAllServers(token) {
 // Track rate limit requests remaining.
 
 var reqRemaining = new Map();
-var lowestReqRemaining, lowestReqRemainingToken;
+var lowestReqRemaining = Infinity, lowestReqRemainingToken;
 
 // token: client token as a string.
 // reqs: number of requests remaining.
 function setReqRemaining(token, reqs) {
-  if (reqs < lowestReqRemaining) {
+  if (reqs <= lowestReqRemaining) {
     lowestReqRemaining = reqs;
     lowestReqRemainingToken = token;
   }