Fixed bug in HelpCommand
Added defensive coding to ui