VID-952 Fix hardcoded message
VID-952 Added additional docs and cleaned up code slightly
Merge pull request #3408 from Wikia/VID-952

VID-952 Fix hardcoded message