Exit on error (-e) added