diff --git a/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java b/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java index b4cd974..7ee0e88 100644 --- a/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java +++ b/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java @@ -237,7 +237,7 @@ public class MapperInvocationHandler implements InvocationHandler, Serializab Set keys = v.keySet(); for (String key : keys) { Object value = v.get(key); - if (mutable) { + if (value != null && mutable) { if (ImmutableList.class.isAssignableFrom(value.getClass())) { m.put(key, new ArrayList((List) value)); } else if (ImmutableMap.class.isAssignableFrom(value.getClass())) {