NPE fixed in language imports checker
Merge branch 'master' into incquery