diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index f9c1bda3a956e3f0a9309a537766eb1050559574..28eccd8f99025436345b5004d00bbf31c8f01705 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1179,6 +1179,11 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
 		if (typeof slave.partners !== "object") {
 			slave.partners = new Set();
 		}
+		for (const partner of slave.partners) {
+			if (typeof partner !== "number") {
+				slave.partners.delete(partner);
+			}
+		}
 	}
 })();
 
diff --git a/src/npc/interaction/fRelation.tw b/src/npc/interaction/fRelation.tw
index 6cc29e525f815fcb5f7e903325fce0236280a026..76a208997178b29c7f2c363497e3cd1e4ec84069 100644
--- a/src/npc/interaction/fRelation.tw
+++ b/src/npc/interaction/fRelation.tw
@@ -33,7 +33,7 @@
 <<run Enunciate(getSlave($AS))>>
 <<run App.Utils.setLocalPronouns(getSlave($AS))>>
 <<run addPartner(getSlave($AS), -1)>>
-<<run addPartner(getSlave($AS), $slaves[$partner])>>
+<<run addPartner(getSlave($AS), $partner)>>
 
 <<setLocalPronouns $slaves[$partner] 2>>