move error handling of tracker to caller again