diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index dac62c72225..362868fda18 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -709,9 +709,10 @@ var/datum/controller/subsystem/cargo/SScargo
 	//Shuttle is loaded now - Charge cargo for it
 	charge_cargo("Shipment #[current_shipment.shipment_num] - Expense",current_shipment.shipment_cost_purchase)
 
-	//Now calculate the aliquot shipment cost for the orders and add it to each order
-	var/aliquot_shipment_cost = current_shipment.shuttle_fee / current_shipment.orders.len
-	for(var/datum/cargo_order/co in current_shipment.orders)
-		co.partial_shipment_fee = aliquot_shipment_cost
+	if(current_shipment.orders.len)
+		//Now calculate the aliquot shipment cost for the orders and add it to each order
+		var/aliquot_shipment_cost = current_shipment.shuttle_fee / current_shipment.orders.len
+		for(var/datum/cargo_order/co in current_shipment.orders)
+			co.partial_shipment_fee = aliquot_shipment_cost
 
 	return 1
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 85a5e4b2304..44743d5d479 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -279,6 +279,12 @@ var/list/ai_verbs_default = list(
 		aiPDA.owner = pickedName
 		aiPDA.name = pickedName + " (" + aiPDA.ownjob + ")"
 
+	//Set the ID Name
+	if(idcard)
+		idcard.registered_name = pickedName
+		idcard.assignment = "AI"
+		idcard.update_name()
+
 	setup_icon() //this is because the ai custom name is related to the ai name, so, we just call the setup icon after someone named their ai
 
 /*
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 7e0d4126422..b24ca9cd1e8 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -336,6 +336,12 @@
 	// if we've changed our name, we also need to update the display name for our PDA
 	setup_PDA()
 
+	// We also need to update our internal ID
+	if(idcard)
+		idcard.assignment = prefix
+		idcard.registered_name = changed_name
+		idcard.update_name()
+
 	//We also need to update name of internal camera.
 	if (camera)
 		camera.c_tag = changed_name