diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 50a24b76ff..697054298d 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -7,7 +7,7 @@
 	anchored = 0
 	density = 1
 	req_access = list(GLOB.access_engine_equip)
-  
+
 	// The following 3 vars are mostly for the prototype
 	var/manual = FALSE
 	var/charge = 0
@@ -199,8 +199,8 @@
 
 /obj/machinery/power/emitter/proc/fire_beam(atom/targeted_atom, mob/user)
 	var/turf/targets_from = get_turf(src)
-	if(targeted_atom == user|| targeted_atom == targets_from)
-		return
+	if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src))
+		return
 	var/obj/item/projectile/P = new projectile_type(targets_from)
 	playsound(src.loc, projectile_sound, 50, 1)
 	if(prob(35))