checkNull changed