Fixed exception when entries == null
Override clear & addAll method