diff --git a/code/modules/admin/verbs/lawpanel.dm b/code/modules/admin/verbs/lawpanel.dm
index 92da08b2375..c17a5e3df42 100644
--- a/code/modules/admin/verbs/lawpanel.dm
+++ b/code/modules/admin/verbs/lawpanel.dm
@@ -4,6 +4,8 @@
 
 	if(!check_rights(R_ADMIN))
 		return
+	if(!isobserver(usr) && SSticker.HasRoundStarted())
+		message_admins("[key_name_admin(usr)] checked AI laws via the Law Panel.")
 
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Law Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	var/datum/law_panel/tgui = new()
@@ -283,7 +285,11 @@
 		borg_information["ref"] = REF(borgo)
 
 		var/datum/ai_laws/lawset = borgo.laws
-		if(!isnull(lawset))
+		if(isnull(lawset))
+			// Whoopsie something wrong wrong this isn't supposed to happen
+			borg_information["laws"] = null
+
+		else
 			var/list/borg_laws = list()
 			// zeroth law on top
 			if(lawset.zeroth || lawset.zeroth_borg)
diff --git a/tgui/packages/tgui/interfaces/Lawpanel.tsx b/tgui/packages/tgui/interfaces/Lawpanel.tsx
index f14face699d..89df6e688ea 100644
--- a/tgui/packages/tgui/interfaces/Lawpanel.tsx
+++ b/tgui/packages/tgui/interfaces/Lawpanel.tsx
@@ -48,9 +48,9 @@ type Silicon = {
   // List of our laws, this is almost never null. If it is null, that's an error.
   laws: null | Law[];
   // String, name of our master AI. Null means no master or we're not a borg
-  master_ai: null | string;
+  master_ai?: null | string;
   // TRUE, we're law-synced to our master AI. FALSE, we're not, null, we're not a borg
-  borg_synced: null | BooleanLike;
+  borg_synced?: null | BooleanLike;
   // REF() to our silicon
   ref: string;
 };
@@ -222,15 +222,19 @@ export const SiliconReadout = (props: { cyborg: Silicon }, context) => {
       <Flex.Item grow>
         <Collapsible title={`${cyborg.borg_type}: ${cyborg.borg_name}`}>
           <Section backgroundColor={'black'}>
-            {cyborg.master_ai && cyborg.borg_synced && (
+            {cyborg.master_ai && !!cyborg.borg_synced && (
               <SyncedBorgDimmer master={cyborg.master_ai} />
             )}
             <Stack vertical>
               <Stack.Item>
                 {cyborg.laws === null ? (
                   <Button
-                    content={`This silicon has a null law datum. That's a problem!
-                Click this this give them one.`}
+                    fluid
+                    textAlign="center"
+                    color="danger"
+                    content={`This silicon has a null law datum. This isn't
+                      supposed to ever happen! Issue report
+                      and then click this this give them one.`}
                     onClick={() => act('give_law_datum', { ref: cyborg.ref })}
                   />
                 ) : (