Fix NPE
Bump version for release