HEX-1900: fix npe
Merge branch 'master' of https://github.com/0xdata/h2o