HHH-8580 clearing a map collection caused NPE