Fixed NPE in /list