diff --git a/code/WorkInProgress/Chemistry-Holder.dm b/code/WorkInProgress/Chemistry-Holder.dm
index 009cea2b74b..49f10196ffe 100644
--- a/code/WorkInProgress/Chemistry-Holder.dm
+++ b/code/WorkInProgress/Chemistry-Holder.dm
@@ -58,7 +58,7 @@ datum
 				return the_id
 
 			trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
-				if (!target)
+				if (!target || src.total_volume<=0)
 					return
 				var/datum/reagents/R = target.reagents
 				amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
diff --git a/code/game/turf.dm b/code/game/turf.dm
index 2618be77c67..77397d4e016 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -632,7 +632,7 @@ turf/simulated/floor/proc/update_icon()
 		if (!src.intact)
 			if (C:amount >= 2)
 				user << "\blue Reinforcing the floor..."
-				if(do_after(user, 30))
+				if(do_after(user, 30) && C && C:amount >= 2 && !src.intact)
 					ReplaceWithEngineFloor()
 					playsound(src.loc, 'Deconstruct.ogg', 80, 1)
 					C:use(2)