Better argument validation