Fix a NPE and prepare for release.