diff --git a/main.go b/main.go
index 78bcef2..2a838ff 100644
--- a/main.go
+++ b/main.go
@@ -166,7 +166,7 @@ func getPlayer(w http.ResponseWriter, r *http.Request) {
 	db.Lock.RLock()
 	tMatches, err := tPlayer.QueryMatches().Order(ent.Desc(match.FieldDate)).Limit(10).All(context.Background())
 	db.Lock.RUnlock()
-	if err != nil || len(tMatches) == 0 || tMatches == nil {
+	if err != nil || len(tMatches) == 0 {
 		log.Debugf("[GP] No matches found for player %s", id)
 		err := utils.SendJSON(response, w)
 		if err != nil {
@@ -179,7 +179,7 @@ func getPlayer(w http.ResponseWriter, r *http.Request) {
 
 	metaStats := new(utils.MatchStats)
 	err = rdc.Get(context.Background(), fmt.Sprintf("csgowtfd_meta_%d", tPlayer.ID), &metaStats)
-	if err != nil || metaStats == nil {
+	if err != nil {
 		wins, ties, losses, err := utils.GetMatchStats(tPlayer, db.Lock)
 		if err != nil {
 			log.Errorf("[GP] Error retrieving match-stats for player %s: %v", id, err)
@@ -187,9 +187,11 @@ func getPlayer(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		response.MatchStats.Win = wins
-		response.MatchStats.Tie = ties
-		response.MatchStats.Loss = losses
+		response.MatchStats = &utils.MatchStats{
+			Win:  wins,
+			Loss: losses,
+			Tie:  ties,
+		}
 
 		err = rdc.Set(&cache.Item{
 			Ctx:   context.Background(),
@@ -205,9 +207,12 @@ func getPlayer(w http.ResponseWriter, r *http.Request) {
 		log.Debugf("[GP] Metastats for %d saved to cache", tPlayer.ID)
 	} else {
 		log.Debugf("[GP] Metastats for %d from redis", tPlayer.ID)
-		response.MatchStats.Win = metaStats.Win
-		response.MatchStats.Tie = metaStats.Tie
-		response.MatchStats.Loss = metaStats.Loss
+
+		response.MatchStats = &utils.MatchStats{
+			Win:  metaStats.Win,
+			Tie:  metaStats.Tie,
+			Loss: metaStats.Loss,
+		}
 	}
 
 	for _, iMatch := range tMatches {