Fixes for NullPointerExceptions.
Bump version code and name for next release.