* fix NPE where existing null in List