Change null check on siblings/children