Null check correction