Make refund a little more fault tolerant