Null check changed