Fix NPE
Fix IllegalStateExceptions
Bump version for release
Fix wording