added null check
Merge branch 'master' of https://github.com/andreao/web-intelligence-project