Added more CLI argument checks