Merge "Fixes NPE in TileQueryHelper"