Fixed a command line handling bug crashing the client.