diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 4d20f5b0383..72f5c8e8024 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -521,8 +521,7 @@ var/global/datum/controller/gameticker/ticker
 		flat = getFlatIcon(pAI)
 		end_icons += flat
 		var/tempstate = end_icons.len
-		ai_completions += {"<br><b><img src="logo_[tempstate].png"> [pAI.name] (Played by: [pAI.key]) [pAI.stat!=2?"survived":"perished"] as a pAI whose master was [pAI.master]! Its directives were:</b>"}
-		ai_completions += "<br>[pAI.write_directives()]"
+		ai_completions += {"<br><b><img src="logo_[tempstate].png"> [pAI.name] (Played by: [pAI.key]) [pAI.stat!=2?"survived":"perished"] as a pAI whose master was [pAI.master]! Its directives were:</b><br>[pAI.write_directives()]"}
 
 	mode.declare_completion()//To declare normal completion.
 
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index af323cf03c6..7c65bb4aba0 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1330,13 +1330,14 @@ var/global/floorIsLava = 0
 		else
 			usr << "<b>SOMETHING SILICON [key_name(S, usr)]'s laws:</b>"
 
-		if (S.laws == null && !ispAI(S))
-			usr << "[key_name(S, usr)]'s laws are null?? Contact a coder."
-		else if(ispAI(S))
+		if(ispAI(S))
 			var/mob/living/silicon/pai/pAI = S
 			pAI.show_directives(usr)
+		else if (S.laws == null)
+			usr << "[key_name(S, usr)]'s laws are null?? Contact a coder."
 		else
 			S.laws.show_laws(usr)
+
 	if(!ai_number)
 		usr << "<b>No AIs located</b>" //Just so you know the thing is actually working and not just ignoring you.