From 52006b3bfd5619e548da6c8a977d96aaad2f94f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Wed, 23 Jul 2014 13:56:32 +0200
Subject: [PATCH] Should fix NPE in tablets, closes #427.

---
 src/main/scala/li/cil/oc/common/item/Tablet.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/li/cil/oc/common/item/Tablet.scala b/src/main/scala/li/cil/oc/common/item/Tablet.scala
index cd3a891d2..82c757c58 100644
--- a/src/main/scala/li/cil/oc/common/item/Tablet.scala
+++ b/src/main/scala/li/cil/oc/common/item/Tablet.scala
@@ -257,11 +257,12 @@ object Tablet extends Callable[TabletWrapper] with RemovalListener[String, Table
 
   def onRemoval(e: RemovalNotification[String, TabletWrapper]) {
     val tablet = e.getValue
-    tablet.stop()
     if (tablet.node != null) {
+      // Server.
+      tablet.stop()
       tablet.node.remove()
+      tablet.writeToNBT()
     }
-    tablet.writeToNBT()
   }
 
   @ForgeSubscribe