Added validation of CLI arguments