Added support for continue on error