Hotfix for vocab check crash.
Merge branch 'master' into release-0.2