diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 5e1467e41b0..5794720b0cf 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -54,9 +54,10 @@
 		connected = null
 	if(!holder)
 		return FALSE
-	forceMove(holder.drop_location())
-	SEND_SIGNAL(src, COMSIG_ASSEMBLY_DETACHED, holder)
+	var/atom/was_holder = holder
 	holder = null
+	forceMove(was_holder.drop_location())
+	SEND_SIGNAL(src, COMSIG_ASSEMBLY_DETACHED, was_holder)
 	return TRUE
 
 /**