Added option to avoid the error stop