fix a null pointer exception
Merge remote-tracking branch 'origin/hls' into hls-firstvariant