Improved arg validation