From df8d651c5d7f3f1201b92e4af5c2a153345032cc Mon Sep 17 00:00:00 2001
From: Daniel Schubert <dschub@gmail.com>
Date: Thu, 19 Jun 2014 13:30:51 +0200
Subject: [PATCH] Fix crash when mining BlockMultipart with Atomic Disassembler

---
 src/main/java/mekanism/common/OreDictCache.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java
index db4c87310..236c7e1eb 100644
--- a/src/main/java/mekanism/common/OreDictCache.java
+++ b/src/main/java/mekanism/common/OreDictCache.java
@@ -20,6 +20,11 @@ public final class OreDictCache
 
 	public static List<String> getOreDictName(ItemStack check)
 	{
+		if (check == null || check.getItem() == null)
+		{
+			return new ArrayList<String>();
+		}
+
 		ItemInfo info = ItemInfo.get(check);
 
 		if(cachedKeys.get(info) != null)