Added back checking of command-line parameters