v0.0.7.1 - fix an NPE