Add check for a selected property set when creating a new property

Add check for a selected property set when creating a new property