Hotfix; prevent JS errors

Change-Id: I983fbda77596197b7792b35da0b11752a822429e
Merge "Hotfix; prevent JS errors"