Catch and handle email change exceptions

Add tests of exception handling behavior

@wedaly