diff --git a/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
index ef24ad68a..5a12c92a6 100644
--- a/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
+++ b/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
@@ -139,7 +139,7 @@ trait ComponentInventory extends Inventory with network.Environment {
   def isComponentSlot(slot: Int) = true
 
   protected def connectItemNode(node: Node) {
-    if (node != null) {
+    if (this.node != null && node != null) {
       this.node.connect(node)
     }
   }