Improved argument validation checking.