Improve handlers.
Improve handlers.

specter119/custodian,davidwaroquiers/custodian,materialsproject/custodian,specter119/custodian,materialsproject/custodian,xhqu1981/custodian,materialsproject/custodian,alberthxf/custodian,specter119/custodian