Better diagnoses

Use metadata to provide more information about email address problems