diff --git a/common/buildcraft/core/ReflectMjAPI.java b/common/buildcraft/core/ReflectMjAPI.java
index 408059a4..db9be768 100755
--- a/common/buildcraft/core/ReflectMjAPI.java
+++ b/common/buildcraft/core/ReflectMjAPI.java
@@ -84,6 +84,8 @@ public class ReflectMjAPI {
 	}
 
 	public static BatteryObject getMjBattery (Object o) {
+		if (o == null)
+			return null;
 		BatteryField f = getMjBattery (o.getClass());
 
 		if (f == null) {