Better arg validation