fixed NPE caused by race condition
Merge branch 'master' of github.com:araqne/webfx