Fix NPE
Bump version number