Prevent errors from client script
Merge branch 'master' into event

* master:
  Prevent errors from client script