More argument validation