diff --git a/code/modules/fantasystation_map_generation/random_resources/trees.dm b/code/modules/fantasystation_map_generation/random_resources/trees.dm
index f2134c855d37d..f33c85810fd98 100644
--- a/code/modules/fantasystation_map_generation/random_resources/trees.dm
+++ b/code/modules/fantasystation_map_generation/random_resources/trees.dm
@@ -42,7 +42,7 @@
 /obj/structure/flora/fantasy_tree/stump
 	name = "stump"
 	desc = "This represents our promise to the elves, and the world itself. To cut down as many trees as possible."
-	icon_state = "tree_stump"
+	icon_state = "tree_1_stump"
 	density = FALSE
 	delete_on_harvest = TRUE
 	seethrough = FALSE
diff --git a/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm b/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm
index 94f9952e5e8b1..01cc6b51c1421 100644
--- a/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm
+++ b/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm
@@ -17,7 +17,8 @@
 
 /datum/component/turf_farm/Destroy(force)
 	UnregisterSignal(turf_parent, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_EXAMINE, COMSIG_QDELETING))
-	UnregisterSignal(tracked_farm, COMSIG_QDELETING)
+	if(tracked_farm)
+		UnregisterSignal(tracked_farm, COMSIG_QDELETING)
 	QDEL_NULL(tracked_farm)
 	turf_parent = null
 	return ..()