More robust handling of Activities that have gone away during survey check

Changes contributed by @cristizmf! Thank you so much!