Added check for null property definition.