Merge branch 'master' into BassAddons

2 files changed, 8 insertions, 4 deletions

diff --git a/README.md b/README.md
index 93dc590f32..bc321f65f9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ https://github.com/Technus/TecTech/wiki
 http://jenkins.usrv.eu:8080/job/Tec%20Tech/
 
 # Runtime Dependencies?
-https://github.com/Technus/TecTech/blob/master/src/main/java/com/github/technus/tectech/TecTech.java#L37
+https://github.com/Technus/TecTech/blob/master/src/main/java/com/github/technus/tectech/TecTech.java#L33
 - Required After
 
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
index 6fe6b164e1..93111e1f60 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
@@ -139,8 +139,12 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
     private void makeStick2() {
         String s = tRecipe.mOutput.getDisplayName();
         if (getBaseMetaTileEntity().isServerSide()) {
-            s = lServerNames.get(tRecipe.mOutput.getDisplayName());
-            if (s == null) {
+            if(lServerNames != null) {
+                s = lServerNames.get(tRecipe.mOutput.getDisplayName());
+                if (s == null) {
+                    s = tRecipe.mOutput.getDisplayName();
+                }
+            }else{
                 s = tRecipe.mOutput.getDisplayName();
             }
         }
@@ -556,4 +560,4 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
     public String[] getStructureDescription(int stackSize) {
         return description;
     }
-}
\ No newline at end of file
+}