Fixing bug and/or crash in CmdLineManager