diff --git a/scripts/scr_company_order/scr_company_order.gml b/scripts/scr_company_order/scr_company_order.gml
index 74abf8c686..cdb20be27b 100644
--- a/scripts/scr_company_order/scr_company_order.gml
+++ b/scripts/scr_company_order/scr_company_order.gml
@@ -1,6 +1,6 @@
 	//stashes varibles for marine reordering
 function temp_marine_variables(co, unit_num){
-		var unit = TTRPG[co][unit_num];
+		var unit = fetch_unit([co, unit_num]);
 		if (unit.squad != "none"){
 			var squad_member;
 			var found = false;
@@ -36,6 +36,7 @@ function temp_marine_variables(co, unit_num){
 }
 
 function scr_company_order(company) {
+	try_and_report_loop("company order", function(company){
 
 	// company : company number
 	// This sorts and crunches the marine variables for the company
@@ -291,7 +292,7 @@ function scr_company_order(company) {
 	        age[co][i]=temp_age[i];
 	        spe[co][i]=temp_spe[i];
 	        god[co][i]=temp_god[i];
-			unit = TTRPG[co][i];
+			unit = fetch_unit([co, i]);
 			unit.load_json_data(json_parse(temp_struct[i]))
 			unit.company = co;
 			unit.marine_number = i;
@@ -313,6 +314,7 @@ function scr_company_order(company) {
 	        }
 	    }
 	}*/
+},company);
 
 }