Fix NPE
Bump version