diff --git a/lua/entities/base_wire_entity.lua b/lua/entities/base_wire_entity.lua
index 6faeca1362..870e639858 100644
--- a/lua/entities/base_wire_entity.lua
+++ b/lua/entities/base_wire_entity.lua
@@ -159,7 +159,7 @@ if CLIENT then
 		local name
 		if CPPI then
 			local owner = self:CPPIGetOwner()
-			name = string.format("(%s)", (isentity(owner) and owner:IsPlayer()) and owner:GetName() or "World")
+			name = string.format("(%s)", IsValid(owner) and owner:Nick() or "World")
 		else
 			name = "(" .. self:GetPlayerName() .. ")"
 		end
diff --git a/lua/wire/client/text_editor/wire_expression2_editor.lua b/lua/wire/client/text_editor/wire_expression2_editor.lua
index 018fa014ec..87bec978e4 100644
--- a/lua/wire/client/text_editor/wire_expression2_editor.lua
+++ b/lua/wire/client/text_editor/wire_expression2_editor.lua
@@ -1461,10 +1461,16 @@ Text here]# ]]
 
 				local label = vgui.Create("DLabel", panel)
 				local idx = v:EntIndex()
-
 				local ownerStr
-				if CPPI and v:CPPIGetOwner():GetName() ~= nick then
-					ownerStr = string.format("Owner: %s | Code Author: %s", v:CPPIGetOwner():GetName(), nick)
+
+				if CPPI then
+					local owner = self:CPPIGetOwner()
+
+					if IsValid(owner) and owner:Nick() ~= nick then
+						ownerStr = string.format("Owner: %s | Code Author: %s", owner:GetName(), nick)
+					else
+						ownerStr = "Owner: " .. nick
+					end
 				else
 					ownerStr = "Owner: " .. nick
 				end