diff --git a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
index 9c2e28489..2250eb21d 100644
--- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
+++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
@@ -104,6 +104,9 @@ class ClassTransformer extends IClassTransformer {
     }
 
     val template = classNodeFor("li/cil/oc/common/asm/template/SimpleEnvironment")
+    if (template == null) {
+      throw new InjectionFailedException("Could not find SimpleComponent template!")
+    }
 
     def inject(methodName: String, signature: String, required: Boolean = false) {
       def filter(method: MethodNode) = method.name == methodName && method.desc == signature
@@ -198,8 +201,8 @@ class ClassTransformer extends IClassTransformer {
     else {
       val nameObfed = FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.')
       val bytes = loader.getClassBytes(nameObfed)
-      if (bytes == null) throw new ClassNotFoundException(namePlain)
-      newClassNode(bytes)
+      if (bytes == null) null
+      else newClassNode(bytes)
     }
   }