Add propertyname check.