add null check, some client fix