diff --git a/code/modules/halo/weapons/gun_overheat.dm b/code/modules/halo/weapons/gun_overheat.dm
index 9817d7c85b2e9..ba3435e6c3451 100644
--- a/code/modules/halo/weapons/gun_overheat.dm
+++ b/code/modules/halo/weapons/gun_overheat.dm
@@ -62,7 +62,7 @@
 	else
 		qdel(heat_bar)
 		heat_bar = null
-	STOP_PROCESSING(SSobj, src)
+		STOP_PROCESSING(SSobj, src)
 
 /obj/item/weapon/gun/proc/overheat_sfx(var/origin)
 	if(overheat_sfx)
diff --git a/code/modules/mob/observer/virtual/base.dm b/code/modules/mob/observer/virtual/base.dm
index 51f2e8d102314..762ec2107ad7c 100644
--- a/code/modules/mob/observer/virtual/base.dm
+++ b/code/modules/mob/observer/virtual/base.dm
@@ -70,4 +70,6 @@ var/list/all_virtual_listeners = list()
 	return TRUE
 
 /mob/shall_have_virtual_mob()
-	return ispath(initial(virtual_mob))
+	var/init_virt = initial(virtual_mob)
+	if(!isnull(init_virt))
+		return ispath(init_virt)