Fix for NPE when inserting null into ConcurrentHashMap