One more NPE reported in bugs.
Unicode issue protection in alexandria during lucene query encoding.
Merge branch '5.5.4-fixes'