diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 0bc318a5494..d58b2f71d03 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -109,6 +109,7 @@
 	if(isEmpProof())
 		return
 	..()
+	qdel(src)//to prevent bomb testing camera from exploding over and over forever
 
 /obj/machinery/camera/blob_act(obj/effect/blob/B)
 	if(B && B.loc == loc)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index ee835dac8fb..6af4d863856 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -15,7 +15,8 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
 										/obj/machinery/field/containment,
 										/obj/structure/disposalpipe,
 										/obj/structure/sign,
-										/obj/machinery/gateway))
+										/obj/machinery/gateway,
+										/obj/structure/lattice))
 
 /obj/singularity/energy_ball
 	name = "energy ball"