Added logic to make sure there is something on the command line