fix minior NPE