Add some argument validation