Command line argumments checking fix