StopOnError feature added