diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index cf0f56cdad9..5ac8bdb15fc 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -495,7 +495,7 @@
 		if("Track With Camera")
 			if(isAI(usr))
 				var/mob/living/silicon/ai/AI = usr
-				var/target_name = input(AI) in AI.trackable_mobs()
+				var/target_name = input(AI) as null|anything in AI.trackable_mobs()
 				AI.ai_camera_track(target_name)
 
 		if("Toggle Camera Light")
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 1672fde7d02..7317450e02d 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -157,7 +157,7 @@
 	src.track = TB
 	return targets
 
-/mob/living/silicon/ai/proc/ai_camera_track(var/target_name in trackable_mobs())
+/mob/living/silicon/ai/proc/ai_camera_track(target_name in trackable_mobs())
 	set category = "AI Commands"
 	set name = "Track With Camera"
 	set desc = "Select who you would like to track."
@@ -187,7 +187,7 @@
 	U.cameraFollow = target
 	U << "Now tracking [target.name] on camera."
 	target.tracking_initiated()
-	
+
 	spawn (0)
 		while (U.cameraFollow == target)
 			if (U.cameraFollow == null)
@@ -229,7 +229,7 @@
 				return 0
 	if(istype(M.loc,/obj/effect/dummy))
 		return 0
-		
+
 	if((T && (T.z in config.contact_levels)) && ((hassensorlevel(M, SUIT_SENSOR_TRACKING) || M in aibots)))
 		return 1
 
@@ -259,4 +259,3 @@
 	tracking_entities--
 	if(!tracking_entities && has_zeroth_law())
 		src << "<span class='notice'>Internal camera is no longer being accessed.</span>"
-	
\ No newline at end of file
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 8d8242cba70..173723bf4cb 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -35,8 +35,12 @@
 		user << "<span class='notice'>You put the [W] into \the [src].</span>"
 		update_icon()
 	else if(istype(W, /obj/item/weapon/pen))
-		var/n_name = sanitize(copytext(input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text, 1, MAX_NAME_LEN))
-		if((loc == usr && usr.stat == 0))
+		var/n_name = input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text|null
+		if(!n_name)
+			return
+		n_name = sanitize(copytext(n_name, 1, MAX_NAME_LEN))
+		
+		if((loc == usr || Adjacent(usr)) && usr.stat == 0)
 			name = "folder[(n_name ? text("- '[n_name]'") : null)]"
 	return