A major bug fix for the crash when tracking failed.