Check LocationDisplay is null first (changed order of checks). Added missing ">" to comments in OwnershipBasedEditing.