v1.0.4.178 - fix little NPE