[CK] fixed issue with NPE.