Add a safety check to look at properties that belong to the default object