diff --git a/app/retrogit.go b/app/retrogit.go
index db2fe9d..d100bcb 100644
--- a/app/retrogit.go
+++ b/app/retrogit.go
@@ -546,7 +546,9 @@ func usersAdminHandler(w http.ResponseWriter, r *http.Request) *AppError {
 		select {
 		case r := <-ch:
 			users = append(users, r)
-			totalRepos += len(r.Repos.AllRepos)
+			if r.Repos != nil {
+				totalRepos += len(r.Repos.AllRepos)
+			}
 		}
 	}
 	var data = map[string]interface{}{
diff --git a/app/templates/users-admin.html b/app/templates/users-admin.html
index 9f87bec..8282b2c 100644
--- a/app/templates/users-admin.html
+++ b/app/templates/users-admin.html
@@ -22,7 +22,13 @@
     {{range .Users}}
       <tr>
         <td><a href="{{routeUrl "digest-admin"}}?user_id={{.Account.GitHubUserId}}">{{.Account.GitHubUserId}}</a></td>
-        <td>{{template "user" .User}}</td>
+        <td>
+          {{if .User}}
+            {{template "user" .User}}
+          {{else}}
+            User could not be looked up, credentials have most likely been revoked.
+          {{end}}
+        </td>
         <td>{{.EmailAddress}}</td>
         <td>{{.Account.Frequency}}</td>
         <td>