Ensure tags don't run into index errors when there are no upstream no… #497

Annotations

3 errors and 10 warnings