Merge pull request #4431 from Wikia/VE-1397

Better checking of namespace