Added check for empty property names.