fix NPE when content is null
Merge branch 'master' into jetty7