NATIVE-13, fix npe
Merge branch 'master' of https://github.com/clockfly/nativetask