Same here. Are you replacing error handlers (if they exist) as well?