diff --git a/internal/scraper/stock/yahoo.go b/internal/scraper/stock/yahoo.go
index d85108cf..ae770e84 100644
--- a/internal/scraper/stock/yahoo.go
+++ b/internal/scraper/stock/yahoo.go
@@ -91,6 +91,9 @@ func GetHistory(ticker string, commodityName string) ([]*price.Price, error) {
 	}
 
 	var prices []*price.Price
+	if len(response.Chart.Result) == 0 {
+		return nil, fmt.Errorf("Failed to fetch data for %s, is the ticker valid?", ticker)
+	}
 	result := response.Chart.Result[0]
 	needExchangePrice := false
 	var exchangePrice *btree.BTree