Added option to control exceptions