Fix NPE bug.
Merge branch 'master' of https://github.com/Data2Semantics/d2s-tools.git