HOTFIX: refactoring caused nullpointer in javascript