minor, added stop on error flag