QAART-368 Fixing the issue that switching frame causing a run time error
Merge pull request #338 from Wikia/QAART-368

QAART-368 Fixing the issue that switching frame causing a run time error