diff --git a/src/main/kotlin/org/neoflock/neocomputers/entity/CaseBlockEntity.kt b/src/main/kotlin/org/neoflock/neocomputers/entity/CaseBlockEntity.kt
index e48a820..ed4e50c 100644
--- a/src/main/kotlin/org/neoflock/neocomputers/entity/CaseBlockEntity.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/entity/CaseBlockEntity.kt
@@ -188,6 +188,7 @@ class CaseBlockEntity(blockPos: BlockPos, blockState: BlockState): NodeBlockEnti
     override fun crash(error: String): Boolean {
         if(isOn) {
             beepAsync("--")
+            sendMachineEvent(MachineCrashEvent(this, error))
         }
         setRunning(false)
         err = error
diff --git a/src/main/kotlin/org/neoflock/neocomputers/entity/MachineEntity.kt b/src/main/kotlin/org/neoflock/neocomputers/entity/MachineEntity.kt
index 27acd6d..be226a6 100644
--- a/src/main/kotlin/org/neoflock/neocomputers/entity/MachineEntity.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/entity/MachineEntity.kt
@@ -13,6 +13,7 @@ abstract class MachineEvent {
 
 data class MachineRedstoneEvent(override val machine: MachineEntity, val side: Direction, val oldValue: Int, val newValue: Int): MachineEvent()
 data class MachinePowerEvent(override val machine: MachineEntity, val nowRunning: Boolean): MachineEvent()
+data class MachineCrashEvent(override val machine: MachineEntity, val error: String): MachineEvent()
 
 interface MachineEntity {
     // Block position of machine, for wireless tech
diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/ComponentItem.kt b/src/main/kotlin/org/neoflock/neocomputers/item/ComponentItem.kt
index 94c2126..766ffbe 100644
--- a/src/main/kotlin/org/neoflock/neocomputers/item/ComponentItem.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/item/ComponentItem.kt
@@ -17,23 +17,23 @@ interface ComponentItem {
     fun getArchitecturesProvided(itemStack: ItemStack): Set<String> = setOf()
 
     // Component placed, node must now exist
-    fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity, newRole: String) {
+    fun whenComponentPlaced(itemStack: ItemStack, machine: MachineEntity?, newRole: String) {
         val oldNode = getComponentNode(itemStack)
         if(oldNode != null) Networking.removeNode(oldNode) // did a mod forget to call whenComponentTaken?
         val node = toComponentNode(itemStack, machine) ?: return
         Networking.addNode(node)
-        machine.getMachineNode().connectTo(node)
+        machine?.getMachineNode()?.connectTo(node)
     }
 
     // Component taken, and thus removed
-    fun whenComponentTaken(itemStack: ItemStack, machine: MachineEntity, previousRole: String) {
+    fun whenComponentTaken(itemStack: ItemStack, machine: MachineEntity?, previousRole: String) {
         val node = getComponentNode(itemStack) ?: return
-        node.disconnectFrom(machine.getMachineNode())
+        // removing disconnects
         Networking.removeNode(node)
     }
 
     // To node, if applicable. Meant to create the node, but not add it, as it will use the itemStack's address to find it again
-    fun toComponentNode(itemStack: ItemStack, machine: MachineEntity): Networking.Node?
+    fun toComponentNode(itemStack: ItemStack, machine: MachineEntity?): Networking.Node?
 
     // Gets the node associated to an item, if it exists
     fun getComponentNode(itemStack: ItemStack): Networking.Node? {