diff --git a/Core/Database.lua b/Core/Database.lua
index 18cfc0b..a37b49f 100644
--- a/Core/Database.lua
+++ b/Core/Database.lua
@@ -394,9 +394,10 @@ end
 
 -- Find an item ID and link by name in any character's data
 function DB:FindItemByName(name)
-	if not name or name == "" or not Guda_DB or not Guda_DB.characters then return nil, nil end
-	
-	for fullName, char in pairs(Guda_DB.characters) do
+	if not name or name == "" then return nil, nil end
+
+	local function searchChar(char)
+		if type(char) ~= "table" then return nil, nil end
 		-- Check bags
 		if char.bags then
 			for bagID, bagData in pairs(char.bags) do
@@ -441,6 +442,20 @@ function DB:FindItemByName(name)
 				end
 			end
 		end
+		return nil, nil
+	end
+
+	if Guda_DB and Guda_DB.characters then
+		for fullName, char in pairs(Guda_DB.characters) do
+			local id, link = searchChar(char)
+			if id then return id, link end
+		end
+	end
+	if addon.sharedCharacters then
+		for fullName, char in pairs(addon.sharedCharacters) do
+			local id, link = searchChar(char)
+			if id then return id, link end
+		end
 	end
 	return nil, nil
 end
diff --git a/Core/SharedData.lua b/Core/SharedData.lua
index 02060d1..292d1a7 100644
--- a/Core/SharedData.lua
+++ b/Core/SharedData.lua
@@ -66,6 +66,13 @@ function SharedData:Initialize()
         if myAccount then break end
     end
 
+    -- If we couldn't identify our own account (e.g. first login on this character,
+    -- before Guda_DB.characters has an entry for us), bail out rather than import
+    -- every character as "shared". The next login will detect correctly.
+    if myAccount == nil then
+        return
+    end
+
     -- Import characters from other accounts into in-memory table
     local importCount = 0
     for fullName, charData in pairs(Guda_SharedCharacters) do
diff --git a/Guda.toc b/Guda.toc
index d2c264c..be515fd 100644
--- a/Guda.toc
+++ b/Guda.toc
@@ -2,7 +2,7 @@
 ## Title: Guda
 ## Notes: All-in-one bag and bank addon for World of Warcraft 1.12.1 (Turtle WoW)
 ## Author: Vati
-## Version: 2.2.2
+## Version: 2.2.3
 ## SavedVariables: Guda_DB
 ## SavedVariablesPerCharacter: Guda_CharDB
 ## OptionalDeps: pfUI
diff --git a/UI/BankFrame.lua b/UI/BankFrame.lua
index 276c216..ccaa7fe 100644
--- a/UI/BankFrame.lua
+++ b/UI/BankFrame.lua
@@ -1557,7 +1557,7 @@ function BankFrame:EnsureMoneyTooltipOverlay()
 
         -- Set tooltip handlers on overlay
         overlay:SetScript("OnEnter", function()
-            Guda_BankFrame_MoneyOnEnter(moneyFrame)
+            Guda_MoneyTooltip_Show(moneyFrame)
         end)
 
         overlay:SetScript("OnLeave", function()