From 1501f467cf8293fd116bd3576723e7f975d6f035 Mon Sep 17 00:00:00 2001
From: diesieben07 <diesieben07@gmail.com>
Date: Wed, 20 May 2015 17:43:52 +0200
Subject: [PATCH] Fix crash when texture loading throws RuntimeException
 without message

---
 .../java/net/minecraftforge/fml/client/FMLClientHandler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
index b270de9be..15159208f 100644
--- a/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
+++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
@@ -99,6 +99,7 @@ import org.lwjgl.LWJGLUtil;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.Display;
 
+import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 import com.google.common.collect.BiMap;
@@ -906,7 +907,7 @@ public class FMLClientHandler implements IFMLSidedHandler
         if (badType == null)
         {
             badType = Sets.newHashSet();
-            brokenTextures.put(resourceLocation.getResourceDomain(), error, badType);
+            brokenTextures.put(resourceLocation.getResourceDomain(), Objects.firstNonNull(error, "Unknown error"), badType);
         }
         badType.add(resourceLocation);
     }