From 8d4088347342e6c3a964df3edce84dba70e6c9d9 Mon Sep 17 00:00:00 2001
From: Pahimar <pahimar@gmail.com>
Date: Thu, 19 May 2016 20:03:29 -0400
Subject: [PATCH] Better NPE protection in serializing energy value maps

---
 .../ee3/util/serialize/EnergyValueMapSerializer.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java b/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java
index d058797f..8b58a4ca 100644
--- a/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java
+++ b/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java
@@ -65,12 +65,14 @@ public class EnergyValueMapSerializer implements JsonSerializer<Map<WrappedStack
         JsonArray jsonArray = new JsonArray();
 
         if (src != null) {
-            for (WrappedStack wrappedStack : src.keySet()) {
+            src.keySet().stream()
+                    .filter(wrappedStack -> wrappedStack != null && wrappedStack.getWrappedObject() != null & src.get(wrappedStack) != null)
+                    .forEach(wrappedStack -> {
                 JsonObject jsonMapping = new JsonObject();
                 jsonMapping.add(wrappedStack.getWrappedObject().getClass().getSimpleName().toLowerCase(), context.serialize(wrappedStack.getWrappedObject()));
                 jsonMapping.addProperty(ENERGY_VALUE, src.get(wrappedStack).getValue());
                 jsonArray.add(jsonMapping);
-            }
+            });
         }
 
         return jsonArray;