Fix small NullPointerException that some users experienced.
Preparing for release v0.8.2