diff --git a/web/server.go b/web/server.go
index 4f381c6..8859b53 100644
--- a/web/server.go
+++ b/web/server.go
@@ -1852,7 +1852,12 @@ func (s *Server) handleSetRacingGroup() http.HandlerFunc {
 			return
 		}
 
-		heatData, _ := s.db.GetHeatData(request.GroupID, 1)
+		heatData, err := s.db.GetHeatData(request.GroupID, 1)
+		if err != nil {
+			s.logger.Error("Failed to get heat data", "error", err)
+			http.Error(w, "Failed to get heat data", http.StatusInternalServerError)
+			return
+		}
 
 		// Broadcast event to admin page
 		s.broadcastAdminEvent(models.AdminEvent{