diff --git a/src/resources/objects/SWGMap.java b/src/resources/objects/SWGMap.java
index 7c4ecda8..9b055425 100644
--- a/src/resources/objects/SWGMap.java
+++ b/src/resources/objects/SWGMap.java
@@ -194,21 +194,14 @@ public class SWGMap<K, V> implements Map<K, V>, Serializable {
 				K key = entry.getKey();
 				V value = entry.getValue();
 				
-				if (valid(key) && valid(value)) 
-				{
-					if (map.containsKey(key)) 
-					{
-						if (map.put(key, value) != null) 
-						{
-							buffer.add(item(2, key, Baseline.toBytes(value), true, true));
-						}
-					} 
-					else 
-					{
-						if(map.put(key, value) == null)
-						{
-							buffer.add(item(0, key, Baseline.toBytes(value), true, true));
-						}
+				if (key != null && valid(key) && value != null && valid(value)) {
+					if (map.containsKey(key)) {
+						map.put(key, value);
+						buffer.add(item(2, key, Baseline.toBytes(value), true, true));
+					} else {
+						map.put(key, value);
+						buffer.add(item(0, key, Baseline.toBytes(value), true, true));
+					
 					}
 				}
 			}