i see two places in the Helper class where it puts a null value when it wants to delete a map entry. The code should use remove() instead to actually remove the entry.