Fix NPE (use empty list instead)