Added an option to activate 'continue on error'