diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index a041ad9be1..04648c39b3 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -47,7 +47,10 @@
 	if (!can_touch(user) || !climbable)
 		return
 
-	var/obj/machinery/door/poddoor/shutters/S = locate() in src.contents
+	var/turf/T = src.loc
+	if(!T || !istype(T)) return
+
+	var/obj/machinery/door/poddoor/shutters/S = locate() in T.contents
 	if(S && S.density) return
 
 	usr.visible_message("<span class='warning'>[user] starts climbing onto \the [src]!</span>")
@@ -58,7 +61,7 @@
 	if (!can_touch(user) || !climbable)
 		return
 
-	S = locate() in src.contents
+	S = locate() in T.contents
 	if(S && S.density) return
 
 	usr.loc = get_turf(src)
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 5dc990ba15..cbfdd53f9a 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -100,6 +100,7 @@
 		for(var/metal in ore_types)
 
 			if(contents.len >= get_storage_capacity())
+				system_error("insufficient storage space")
 				active = 0
 				need_player_check = 1
 				update_icon()