diff --git a/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/MapImpl.java b/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/MapImpl.java
index fcaabb774..fab6ba746 100755
--- a/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/MapImpl.java
+++ b/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/MapImpl.java
@@ -137,7 +137,10 @@ public boolean add(MapEntry mapEntry)
 	@Override
 	public boolean addAll(Collection<? extends MapEntry> c)
 	{
-		throw new UnsupportedOperationException("Map collection doesn't support this operation.");
+		if (c == null)
+			throw new NullPointerException("Passed in collection is null.");
+		
+		return _mapCollection.addAll(c);
 	}
 
 	@Override