Fixing error messages and creation of vocabulary.
Merge pull request #5525 from openscholar/5523

Fixing error messages and creation of vocabulary.