diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java
index d124696c39..4939d2cdbb 100644
--- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java
+++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java
@@ -56,6 +56,10 @@ public class XmlGenericMapAdapter<K, V> extends
 
     @Override
     public MapType<K, V> marshal(Map<K, V> unserialized) throws Exception {
+        if (unserialized == null) {
+            return null;
+        }
+
         MapType<K, V> mapType = new MapType<K, V>();
 
         for (Map.Entry<K, V> entry : unserialized.entrySet()) {