* fix multiple NPE