diff --git a/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedCollectionBase.java b/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedCollectionBase.java
index d334406..f0dc371 100644
--- a/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedCollectionBase.java
+++ b/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedCollectionBase.java
@@ -45,6 +45,9 @@ public abstract class IndexedCollectionBase<T> extends AbstractCollection<T> imp
 
     @Override
     public void forEach(Consumer<? super T> action) {
+        if (action == null) {
+            return;
+        }
         for (int i = 0; i < rawSize(); i++) {
             if (!isRemoved(i)) {
                 action.accept(getEntryAt(i));
diff --git a/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedMapBase.java b/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedMapBase.java
index d85aea3..f041870 100644
--- a/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedMapBase.java
+++ b/datastructures-tiny/src/main/java/org/xbib/datastructures/tiny/IndexedMapBase.java
@@ -112,6 +112,9 @@ public abstract class IndexedMapBase<K, V> implements IndexedMap<K, V> {
 
     @Override
     public void putAll(Map<? extends K, ? extends V> m) {
+        if (m == null) {
+            return;
+        }
         m.forEach(this::put);
     }
 
diff --git a/datastructures-tiny/src/test/java/org/xbib/datastructures/tiny/TinyMapTest.java b/datastructures-tiny/src/test/java/org/xbib/datastructures/tiny/TinyMapTest.java
index dcaa9d6..6fb189d 100644
--- a/datastructures-tiny/src/test/java/org/xbib/datastructures/tiny/TinyMapTest.java
+++ b/datastructures-tiny/src/test/java/org/xbib/datastructures/tiny/TinyMapTest.java
@@ -220,6 +220,14 @@ public class TinyMapTest {
         assertEquals(100, set.size());
     }
 
+    @Test
+    public void testPutAllNull() {
+        TinyMap.Builder<String, Object> builder = TinyMap.builder();
+        builder.put("a", "b");
+        builder.putAll(null);
+        assertEquals(1, builder.build().size());
+    }
+
     private void testCount(int count, boolean withNull) {
         TinyMap.Builder<String, Object> builder = TinyMap.builder();
         LinkedHashMap<String, Object> expectedMap = new LinkedHashMap<>();
diff --git a/gradle.properties b/gradle.properties
index 3786e99..f24d173 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group = org.xbib
 name = datastructures
-version = 0.0.2
+version = 0.0.3
 
 gradle.wrapper.version = 6.6.1