improved the error annotation skipping the saving the same tokens twice for a specific type of error