*8625* Remove custom error handler