Nullpointer fix
Merge pull request #339 from boersmamarcel/hotfix_js_nullpointer

Nullpointer fix