Handle a missing site on the photopoint output more gracefully.
Rewrite of the photo point handling code.