Exit on fail SHOULD work now