fix NPE in onChange when in forked execution
Merge pull request #56 from houbie/master

fix NPE in onChange when in forked execution