Fixed NPE in list loading