modified abortOnError to false