Support name cleanup outbound
Catch errors in the handler