Merge branch 'NPE-fix' of https://github.com/spark404/cxf-xjc-utils
This closes #1