diff --git a/code/__defines/atc.dm b/code/__defines/atc.dm
index 39bca5f56f..55357df403 100644
--- a/code/__defines/atc.dm
+++ b/code/__defines/atc.dm
@@ -8,8 +8,8 @@
 
 #define ATC_SCI "Scientific"
 #define ATC_LUX "Luxury"
-#define ATC_ALL_CIV ATC_MED, ATC_TRANS, ATC_FREIGHT, ATC_DEF, ATC_INDU, ATC_SCI, ATC_SCI, ATC_LUX
+#define ATC_ALL_CIV ATC_MED, ATC_TRANS, ATC_FREIGHT, ATC_DEF, ATC_INDU, ATC_SCI, ATC_LUX
 
 #define ATC_DIPLO "Diplomacy"
 #define ATC_SALVAGE "Salvage"
-#define ATC_ALL ATC_MED, ATC_TRANS, ATC_FREIGHT, ATC_DEF, ATC_INDU, ATC_SCI, ATC_SCI, ATC_LUX, ATC_DIPLO, ATC_SALVAGE
\ No newline at end of file
+#define ATC_ALL ATC_MED, ATC_TRANS, ATC_FREIGHT, ATC_DEF, ATC_INDU, ATC_SCI, ATC_LUX, ATC_DIPLO, ATC_SALVAGE
\ No newline at end of file
diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm
index 3af8e75783..660addbcd0 100644
--- a/code/modules/busy_space/organizations.dm
+++ b/code/modules/busy_space/organizations.dm
@@ -194,8 +194,9 @@
 	possible_mission_types &= destination_mission_types
 
 	//sanity checking
-	if(!possible_mission_types)
-		return "ERROR" //change to fail silently after testing
+	if(!possible_mission_types) //an org was given a system that contains no missions they run. let's fail gracefully about it
+		current_ship = "vessel [pick("SOL", "VIR", "STC", "ACE")]-575-[rand(0,999999)]" //unnamed ship
+		return "[current ship], traveling to local registrar" //instantly identifiable as an error but still immersive
 
 	//select a mission we can run
 	var/datum/lore/mission/selected_mission
@@ -1116,7 +1117,7 @@
 		/datum/lore/system/zhu_que = 10,
 		/datum/lore/system/love = 5,
 		/datum/lore/system/isavaus_gamble = 3,
-		/datum/lore/system/whythe = 3 //not in scg space but im sure they can still get at it
+		/datum/lore/system/whythe = 2 //not in scg space but im sure they can still get at it
 		)
 
 //kind of experimental
@@ -1141,8 +1142,6 @@
 		/datum/lore/system/vounna = 5,
 		/datum/lore/system/sidhe = 5,
 		/datum/lore/system/new_cairo = 3, //funny bugs
-//		/datum/lore/system/mahimahi = 5, //uncomment these if theyre ever like, detailed enough to have a specific named embassy
-//		/datum/lore/system/kauqxum = 5,
 		)
 //TODO add 5 Arrows, Protectorate, Pearlshield
 //maybe some other flavorful government agencies like the EIO or the GSA or SOFI
diff --git a/code/modules/busy_space/systems.dm b/code/modules/busy_space/systems.dm
index 96d9860abc..fe2c169d0e 100644
--- a/code/modules/busy_space/systems.dm
+++ b/code/modules/busy_space/systems.dm
@@ -153,7 +153,7 @@
 		new /datum/lore/location("Oyo-ni-aaye on Kishar, Alpha Centauri", list(ATC_ALL_CIV)),
 		new /datum/lore/location("Valhalla in Heaven, Alpha Centauri", list(ATC_TYPICAL)),
 		new /datum/lore/location("Elyisum in Heaven, Alpha Centauri", list(ATC_TYPICAL)),
-		new /datum/lore/location("Ragnarok, Alpha Centauri", list(ATC_INDU, ATC_FREIGHT)),
+		new /datum/lore/location("the remains of Ragnarok, Alpha Centauri", list(ATC_INDU, ATC_FREIGHT, ATC_SCI)),
 		new /datum/lore/location("The Rings in Heaven, Alpha Centauri", list(ATC_ALL_CIV)),
 		new /datum/lore/location("The Angelic College at Heaven, Alpha Centauri", list(ATC_SCI))
 		)
@@ -404,8 +404,8 @@
 	locations = list(
 		new /datum/lore/location("Skylight on Angessa's Pearl", list(ATC_ALL_CIV, ATC_DIPLO)),
 		new /datum/lore/location("Melt on Angessa's Pearl", list(ATC_TRANS, ATC_FREIGHT)), // melt doesn't get emergency responders
-		new /datum/lore/location("Angessa's Grave on Angessa's Pearl", list(ATC_TRANS, ATC_LUX, ATC_MED)),
-		new /datum/lore/location("Tsunami on Angessa's Pearl", list(ATC_TYPICAL)),
+		new /datum/lore/location("Angessa's Grave on Angessa's Pearl", list(ATC_TYPICAL, ATC_SCI, ATC_DIPLO)),
+		new /datum/lore/location("Tsunami on Angessa's Pearl", list(ATC_ALL_CIV, ATC_DIPLO)),
 		new /datum/lore/location("a demonstration on Angessa's Pearl", list(ATC_DEF, ATC_MED)),
 		new /datum/lore/location("a Far Kingdoms wreck in Exalt's Light", list(ATC_SALVAGE, ATC_SCI))
 		)