added check for empty property name