improved error checking in tracking mode