Added fail on error flag support