Improve exception handling in Registrar