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