Unrelated to this PR, but I think this should be:

    ValueError("Empty vocabulary passed to " + self.__class__.__name__)