Fix NPE with CmdShow