Update build.
Version bump.
Fix NPE.