diff --git a/primitiveCollections/src/main/java/org/lucares/collections/LongLongHashMap.java b/primitiveCollections/src/main/java/org/lucares/collections/LongLongHashMap.java
index ede03fa..7b4f7a0 100644
--- a/primitiveCollections/src/main/java/org/lucares/collections/LongLongHashMap.java
+++ b/primitiveCollections/src/main/java/org/lucares/collections/LongLongHashMap.java
@@ -1,10 +1,11 @@
 package org.lucares.collections;
 
 import java.util.Arrays;
-import java.util.NoSuchElementException;
 
 /**
  * A hash map where key and value are primitive longs.
+ * 
+ * @see LongObjHashMap
  */
 public class LongLongHashMap {
 
@@ -125,21 +126,19 @@ public class LongLongHashMap {
 	}
 
 	/**
-	 * Returns the value for the given key if it exists. This method throws a
-	 * {@link NoSuchElementException} if the key does not exist. Use
-	 * {@link #containsKey(long)} to check before calling {@link #get(long)}.
+	 * Returns the value for the given key if it exists or {@code defaultValue} if it does not exist.
 	 *
 	 * @param key the key
-	 * @return the value if it exists
-	 * @throws NoSuchElementException if the value does not exist
+	 * @param defaultValue the value to return if the given key does not exist
+	 * @return the value if it exists, or defaultValue
 	 */
-	public long get(final long key) {
+	public long get(final long key, long defaultValue) {
 
 		if (key == NULL_KEY) {
 			if (zeroValue != null) {
 				return zeroValue;
 			}
-			throw new NoSuchElementException();
+			return defaultValue;
 		}
 
 		final int searchStart = spread(key);
@@ -150,7 +149,7 @@ public class LongLongHashMap {
 			}
 			currentPosition = (currentPosition + 1) % keys.length;
 		} while (currentPosition != searchStart);
-		throw new NoSuchElementException();
+		return defaultValue;
 	}
 
 	/**
@@ -206,7 +205,7 @@ public class LongLongHashMap {
 	 * <p>
 	 * The mapping for given key is updated by calling {@code function} with the old
 	 * value. The return value will be set as new value. If the map does not contain
-	 * a mapping for the key, then {@code function} is with
+	 * a mapping for the key, then {@code function} is called with
 	 * {@code initialValueIfAbsent}.
 	 *
 	 * @param key                  the key
@@ -280,7 +279,7 @@ public class LongLongHashMap {
 		for (int i = 0; i < sortedKeys.length; i++) {
 			final long key = sortedKeys[i];
 			if (key != EMPTY_SLOT) {
-				consumer.accept(key, get(key));
+				consumer.accept(key, get(key, 0)); // the default value of 'get' will not be used, because the key exists
 			} else if (key == EMPTY_SLOT) {
 				final int posFirstKey = findPosOfFirstPositiveKey(sortedKeys);
 				if (posFirstKey < 0) {
diff --git a/primitiveCollections/src/test/java/org/lucares/collections/LongLongHashMapTest.java b/primitiveCollections/src/test/java/org/lucares/collections/LongLongHashMapTest.java
index 92fdb1e..9bf7309 100644
--- a/primitiveCollections/src/test/java/org/lucares/collections/LongLongHashMapTest.java
+++ b/primitiveCollections/src/test/java/org/lucares/collections/LongLongHashMapTest.java
@@ -30,12 +30,12 @@ public class LongLongHashMapTest {
 		// add value and check it is in the map
 		map.put(key, valueA);
 		Assertions.assertTrue(map.containsKey(key));
-		Assertions.assertEquals(valueA, map.get(key));
+		Assertions.assertEquals(valueA, map.get(key, Long.MIN_VALUE));
 		Assertions.assertEquals(1, map.size());
 
 		// overwrite value
 		map.put(key, valueB);
-		Assertions.assertEquals(valueB, map.get(key));
+		Assertions.assertEquals(valueB, map.get(key, Long.MIN_VALUE));
 		Assertions.assertEquals(1, map.size());
 
 		// remove value and check it is gone
@@ -50,10 +50,10 @@ public class LongLongHashMapTest {
 
 		final long key = 1;
 		map.compute(key, 6, l -> l + 1);
-		Assertions.assertEquals(7, map.get(key), "initialValueIfAbsent is used when there is no mapping for the key");
+		Assertions.assertEquals(7, map.get(key, Long.MIN_VALUE), "initialValueIfAbsent is used when there is no mapping for the key");
 
 		map.compute(key, 6, l -> l + 1);
-		Assertions.assertEquals(8, map.get(key), "update function is called when 'zeroKey' is set");
+		Assertions.assertEquals(8, map.get(key, Long.MIN_VALUE), "update function is called when 'zeroKey' is set");
 	}
 
 	@Test
@@ -61,10 +61,10 @@ public class LongLongHashMapTest {
 		final LongLongHashMap map = new LongLongHashMap();
 		final long key = 1;
 		map.compute(key, 6, l -> l + 1);
-		Assertions.assertEquals(7, map.get(key), "initialValueIfAbsent is used when there is no mapping for the key");
+		Assertions.assertEquals(7, map.get(key, Long.MIN_VALUE), "initialValueIfAbsent is used when there is no mapping for the key");
 
 		map.compute(key, 6, l -> l + 1);
-		Assertions.assertEquals(8, map.get(key), "update function is called when key is set");
+		Assertions.assertEquals(8, map.get(key, Long.MIN_VALUE), "update function is called when key is set");
 	}
 
 	@Test
@@ -79,7 +79,7 @@ public class LongLongHashMapTest {
 			map.put(l, l);
 		});
 		entries.stream().forEachOrdered(l -> {
-			Assertions.assertEquals(l, map.get(l));
+			Assertions.assertEquals(l, map.get(l, Long.MIN_VALUE));
 		});
 		Assertions.assertEquals(16, map.getCapacity(), "capacity after adding 12 entries must be a the smallest number "
 				+ "that satisfies initialCapacity * 2^n >= entries/fillFactor");
@@ -95,7 +95,7 @@ public class LongLongHashMapTest {
 
 		keysWithSameSpread.stream().forEach(l -> map.put(l, l));
 		Assertions.assertEquals(keysWithSameSpread.size(), map.size());
-		keysWithSameSpread.stream().forEach(l -> Assertions.assertEquals(l, map.get(l)));
+		keysWithSameSpread.stream().forEach(l -> Assertions.assertEquals(l, map.get(l, Long.MIN_VALUE)));
 	}
 
 	@Test