Added catch clause for cases where authentication is needed.
Updated EmailHandler