Fixed npe for byte array null
Merge branch 'master' of https://github.com/janhelge/wt-public-repo