Update to do a LOT more checking, and to NOT send email.