v0.2.0.2 - fixing small NPE