Finish removing the gather suboption of the error handler

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix merge conflicts

Signed-off-by: Marc Delisle <marc@infomarc.info>