4 Commits (fix_crash_email)