Extra logging and work around to e-mails not mapping to the appropriate object