all else

code/modules/modular_computers/hardware/ai_slot.dm

@@ -10,6 +10,10 @@
 	var/obj/item/aicard/stored_card
 	var/locked = FALSE
 
+/obj/item/computer_hardware/ai_slot/Destroy()
+	QDEL_NULL(stored_card)
+	return ..()
+
 ///What happens when the intellicard is removed (or deleted) from the module, through try_eject() or not.
 /obj/item/computer_hardware/ai_slot/Exited(atom/movable/gone, direction)
 	if(stored_card == gone)
@@ -55,7 +59,7 @@
 		if(Adjacent(user))
 			user.put_in_hands(stored_card)
 		else
-			stored_card.forceMove(drop_location())
+			stored_card.forceMove(get_turf(src))
 
 		return TRUE
 	return FALSE

code/modules/modular_computers/hardware/battery_module.dm

@@ -16,7 +16,7 @@
 		battery = new battery_type(src)
 
 /obj/item/computer_hardware/battery/Destroy()
-	battery = null
+	QDEL_NULL(battery)
 	return ..()
 
 ///What happens when the battery is removed (or deleted) from the module, through try_eject() or not.
@@ -59,7 +59,7 @@
 			user.put_in_hands(battery)
 			to_chat(user, span_notice("You detach \the [battery] from \the [src]."))
 		else
-			battery.forceMove(drop_location())
+			battery.forceMove(get_turf(src))
 		return TRUE
 
 /obj/item/stock_parts/cell/computer

code/modules/modular_computers/hardware/card_slot.dm

@@ -94,7 +94,7 @@
 	if(user && !issilicon(user) && in_range(src, user))
 		user.put_in_hands(stored_card)
 	else
-		stored_card.forceMove(drop_location())
+		stored_card.forceMove(get_turf(src))
 
 	to_chat(user, span_notice("You remove the card from \the [src]."))
 	playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)