Catch and handle email change exceptions
Includes new tests