fixes clear id mixup, refs #7660
better error catching, additional email cleanup, fixes #7824, refs #7660
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
better error catching, additional email cleanup, fixes #7824, refs #7660
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev