diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm
index 6ad9a6069f..7675fb2126 100644
--- a/code/__defines/subsystems.dm
+++ b/code/__defines/subsystems.dm
@@ -33,7 +33,7 @@
 	..();\
 	if(!initialized) {\
 		args[1] = TRUE;\
-		SSatoms.InitAtom(src, args);\
+		SSatoms?.InitAtom(src, args);\
 	}\
 }
 
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 48a4445e19..e0b53e3063 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -1260,7 +1260,6 @@ var/mob/dview/dview_mob = new
 		color = origin.color
 		set_light(origin.light_range, origin.light_power, origin.light_color)
 
-INITIALIZE_IMMEDIATE(/mob/dview)
 /mob/dview/Initialize()
 	. = ..()
 	// We don't want to be in any mob lists; we're a dummy not a mob.