PLA-1705 Fix fatal
Merge pull request #4174 from Wikia/PLA-1705r234

PLA-1705 Fix fatal