Improved the handling of faulty trackers