Fix null pointer
Merge branch 'master' into jsonp-polling-transport