Added empty check for property name