Improve error handling in tracker.go