* v1.0.4.181 - fix NPE