Fixed NPE
Strange mutable.HashMap behaviour #SCL-5178 Fixed