Add patch to prevent abort on first error