Fix NPE with /list in console