avoid potential NPE
Merge branch 'master' of https://github.com/gdelmas/AppCodeDashSearch into project-context-detection