raise-on and raise-on-all added