diff --git a/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java b/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java
index f61b2deb..e7c5aefa 100644
--- a/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java
+++ b/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java
@@ -45,8 +45,12 @@ public class SPacketMEUpdateBuffer {
     }
 
     public static void disable() {
-        task.cancel(false);
-        executor.shutdown();
+        if (task != null) {
+            task.cancel(false);
+        }
+        if (executor != null) {
+            executor.shutdown();
+        }
     }
 
     public static void scheduleItemUpdate(EntityPlayerMP player, List<IAEItemStack> stacks) {