From 8845629dd7499a0203a4bd2c80bfaf9164081cf5 Mon Sep 17 00:00:00 2001
From: Patrick Fairbank <pat@patfairbank.com>
Date: Mon, 31 Aug 2015 22:46:24 -0700
Subject: [PATCH] Fix TBA team pull for nonexistent teams.

---
 setup_teams.go | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/setup_teams.go b/setup_teams.go
index 4b1a1b9..0c5a0c8 100644
--- a/setup_teams.go
+++ b/setup_teams.go
@@ -272,32 +272,31 @@ func getOfficialTeamInfo(teamId int) (*Team, error) {
 		}
 
 		// Check if the result is valid.  If a team is not found, just return a basic team
-		if tbaTeam == nil {
+		if tbaTeam.TeamNumber == 0 {
 			team = Team{Id: teamId}
-			return &team, nil
-		}
-
-		var recentAwards []TbaAward
-		if eventSettings.TBAAwardsDownloadEnabled {
-			recentAwards, err = getTeamAwardsFromTba(teamId)
-			if err != nil {
-				return nil, err
+		} else {
+			var recentAwards []TbaAward
+			if eventSettings.TBAAwardsDownloadEnabled {
+				recentAwards, err = getTeamAwardsFromTba(teamId)
+				if err != nil {
+					return nil, err
+				}
 			}
-		}
 
-		var accomplishmentsBuffer bytes.Buffer
+			var accomplishmentsBuffer bytes.Buffer
 
-		// Generate accomplishments string
-		for _, award := range recentAwards {
-			if time.Now().Year()-award.Year <= 2 {
-				accomplishmentsBuffer.WriteString(fmt.Sprint(award.Year, " - ", award.Name, "\n"))
+			// Generate accomplishments string
+			for _, award := range recentAwards {
+				if time.Now().Year()-award.Year <= 2 {
+					accomplishmentsBuffer.WriteString(fmt.Sprint(award.Year, " - ", award.Name, "\n"))
+				}
 			}
-		}
 
-		// Use those variables to make a team object
-		team = Team{Id: teamId, Name: tbaTeam.Name, Nickname: tbaTeam.Nickname,
-			City: tbaTeam.Locality, StateProv: tbaTeam.Reigon,
-			Country: tbaTeam.Country, RookieYear: tbaTeam.RookieYear, Accomplishments: accomplishmentsBuffer.String()}
+			// Use those variables to make a team object
+			team = Team{Id: teamId, Name: tbaTeam.Name, Nickname: tbaTeam.Nickname,
+				City: tbaTeam.Locality, StateProv: tbaTeam.Reigon,
+				Country: tbaTeam.Country, RookieYear: tbaTeam.RookieYear, Accomplishments: accomplishmentsBuffer.String()}
+		}
 	} else {
 		// If team grab is disabled, just use the team number
 		team = Team{Id: teamId}