Add more command line argument error handling