From 90e89673d3b1278e2d28a7864339e6d7649aa4de Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Mon, 23 Mar 2015 07:36:32 -0400
Subject: [PATCH] Fixed #786

---
 .../ee3/exchange/EnergyValueRegistry.java     | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
index 5167d2a0..5dc130af 100644
--- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
+++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
@@ -530,41 +530,44 @@ public class EnergyValueRegistry implements INBTTaggable, JsonSerializer<EnergyV
     {
         List stacksInRange = new ArrayList<WrappedStack>();
 
-        SortedMap<EnergyValue, List<WrappedStack>> tailMap = energyValueRegistry.valueMappings.tailMap(start);
-        SortedMap<EnergyValue, List<WrappedStack>> headMap = energyValueRegistry.valueMappings.headMap(finish);
-
-        SortedMap<EnergyValue, List<WrappedStack>> smallerMap;
-        SortedMap<EnergyValue, List<WrappedStack>> biggerMap;
-
-        if (!tailMap.isEmpty() && !headMap.isEmpty())
+        if (valueMappings != null)
         {
+            SortedMap<EnergyValue, List<WrappedStack>> tailMap = energyValueRegistry.valueMappings.tailMap(start);
+            SortedMap<EnergyValue, List<WrappedStack>> headMap = energyValueRegistry.valueMappings.headMap(finish);
 
-            if (tailMap.size() <= headMap.size())
-            {
-                smallerMap = tailMap;
-                biggerMap = headMap;
-            }
-            else
-            {
-                smallerMap = headMap;
-                biggerMap = tailMap;
-            }
+            SortedMap<EnergyValue, List<WrappedStack>> smallerMap;
+            SortedMap<EnergyValue, List<WrappedStack>> biggerMap;
 
-            for (EnergyValue value : smallerMap.keySet())
+            if (!tailMap.isEmpty() && !headMap.isEmpty())
             {
-                if (biggerMap.containsKey(value))
+
+                if (tailMap.size() <= headMap.size())
                 {
-                    for (WrappedStack wrappedStack : energyValueRegistry.valueMappings.get(value))
+                    smallerMap = tailMap;
+                    biggerMap = headMap;
+                }
+                else
+                {
+                    smallerMap = headMap;
+                    biggerMap = tailMap;
+                }
+
+                for (EnergyValue value : smallerMap.keySet())
+                {
+                    if (biggerMap.containsKey(value))
                     {
-                        if (wrappedStack.getWrappedStack() instanceof ItemStack || wrappedStack.getWrappedStack() instanceof FluidStack)
+                        for (WrappedStack wrappedStack : energyValueRegistry.valueMappings.get(value))
                         {
-                            stacksInRange.add(wrappedStack.getWrappedStack());
-                        }
-                        else if (wrappedStack.getWrappedStack() instanceof OreStack)
-                        {
-                            for (ItemStack itemStack : OreDictionary.getOres(((OreStack) wrappedStack.getWrappedStack()).oreName))
+                            if (wrappedStack.getWrappedStack() instanceof ItemStack || wrappedStack.getWrappedStack() instanceof FluidStack)
                             {
-                                stacksInRange.add(itemStack);
+                                stacksInRange.add(wrappedStack.getWrappedStack());
+                            }
+                            else if (wrappedStack.getWrappedStack() instanceof OreStack)
+                            {
+                                for (ItemStack itemStack : OreDictionary.getOres(((OreStack) wrappedStack.getWrappedStack()).oreName))
+                                {
+                                    stacksInRange.add(itemStack);
+                                }
                             }
                         }
                     }