Modificaitons to handlers. Main thing is consolidating the Scf error handler.
Modificaitons to handlers. Main thing is consolidating the Scf error
handler.

materialsproject/custodian,materialsproject/custodian,materialsproject/custodian