changed some voucher validations and exceptions