v1.0.2.141 - fix NPE