Make email manager more fault tolerant