diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index ec666955e7..742c27cdc6 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -845,6 +845,8 @@
 	spawn(rand(0,15))
 		update_icon()
 		// CHOMPEdit Start: Looping Alarms
+		if(!soundloop)
+			return
 		if(stat & (NOPOWER | BROKEN))
 			soundloop.stop()
 		else if(atmoswarn)
diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm
index 781352ece4..abd68b12e1 100644
--- a/code/game/machinery/fire_alarm.dm
+++ b/code/game/machinery/fire_alarm.dm
@@ -67,11 +67,11 @@ FIRE ALARM
 	causality = new(list(src), FALSE) // CHOMPEdit: Create soundloop
 
 /obj/machinery/firealarm/Destroy()
+	reset()		//CHOMPEdit alarm needs to go when destroyed
 	QDEL_NULL(soundloop) // CHOMPEdit: Just clearing the loop here
 	QDEL_NULL(engalarm) // CHOMPEdit: Clearing the loop here too
 	QDEL_NULL(critalarm) // CHOMPEdit: Clearing the loop here too
 	QDEL_NULL(causality) // CHOMPEdit: Clearing the loop here too
-	reset()		//CHOMPEdit alarm needs to go when destroyed
 	return ..()
 
 /obj/machinery/firealarm/proc/offset_alarm()
@@ -183,6 +183,8 @@ FIRE ALARM
 	spawn(rand(0,15))
 		update_icon()
 		// CHOMPEdit Start: Looping Red/Violet/Orange Alarms
+		if(!soundloop)
+			return
 		if(stat & (NOPOWER | BROKEN)) // Are we broken or out of power?
 			soundloop.stop() // Stop the loop once we're out of power
 			engalarm.stop() // Stop these bc we're out of power
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 5c29b1ae71..1087de3ca2 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -85,8 +85,8 @@
 	var/pull_radius = 14
 	// Time in ticks between delamination ('exploding') and exploding (as in the actual boom)
 	var/pull_time = 100
-	var/min_explosion_power = 8
-	var/max_explosion_power = 16
+	var/min_explosion_power = 12 // CHOMPEdit some more damage was 8
+	var/max_explosion_power = 24 // CHOMPEdit some more damage was 16
 
 	var/emergency_issued = 0