Ticket #620: adding the proper checks to make sure a bad site is not fetch

..