Bug fix - name could be null in Plugin