Merge pull request #1564 from jacobbaungard/check_cluster_arg_validation