Tweak checking of arguments when revoking