NATIVE-13, fix NPE