- fix NPE