diff --git a/toontown/catalog/CatalogItemPanel.py b/toontown/catalog/CatalogItemPanel.py
index caee7b43..6c7d2a7a 100755
--- a/toontown/catalog/CatalogItemPanel.py
+++ b/toontown/catalog/CatalogItemPanel.py
@@ -402,13 +402,9 @@ class CatalogItemPanel(DirectFrame):
              'item': self['item'].getName(),
              'price': self['item'].getPrice(self['type'])}
         else:
-            friendText = 'Error'
-            numFriends = len(base.localAvatar.friendsList) + len(base.cr.avList) - 1
-            if numFriends > 0:
-                friendText = self.parentCatalogScreen.friendName
             message = TTLocalizer.CatalogVerifyGift % {'item': self['item'].getName(),
              'price': self['item'].getPrice(self['type']),
-             'friend': friendText}
+             'friend': TTLocalizer.CatalogGiftError if not self.parentCatalogScreen.friendName else self.parentCatalogScreen.friendName}
         self.verify = TTDialog.TTGlobalDialog(doneEvent='verifyGiftDone', message=message, style=TTDialog.TwoChoice)
         self.verify.show()
         self.accept('verifyGiftDone', self.__handleVerifyGift)
diff --git a/toontown/catalog/CatalogScreen.py b/toontown/catalog/CatalogScreen.py
index 5ea5e21c..ceb0e33b 100755
--- a/toontown/catalog/CatalogScreen.py
+++ b/toontown/catalog/CatalogScreen.py
@@ -47,7 +47,7 @@ class CatalogScreen(DirectFrame):
         DirectFrame.__init__(self, parent)
         self.friend = None
         self.friendAvId = None
-        self.friendName = 'Error Nameless Toon'
+        self.friendName = None
         self.friendList = []
         self.friends = []
         self.load(guiItems, guiButton, guiBack)
@@ -1045,6 +1045,7 @@ class CatalogScreen(DirectFrame):
             self.scrollList.show()
             self.hideEmblems()
             self.giftToggle['text'] = TTLocalizer.CatalogGiftToggleOn
+            self.friendLabel['text'] = TTLocalizer.CatalogGiftChoose
             self.__loadFriend()
         else:
             self.friend = None
diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py
index 8e0a38fd..88583b0c 100755
--- a/toontown/toonbase/TTLocalizerEnglish.py
+++ b/toontown/toonbase/TTLocalizerEnglish.py
@@ -5462,6 +5462,7 @@ CatalogGoodbyeList = ['Bye now!',
  'Bye!']
 CatalogHelpText1 = 'Turn the page to see items for sale.'
 CatalogSeriesLabel = 'Series %s'
+CatalogGiftError = 'Error'
 CatalogGiftFor = 'Buy Gift for:'
 CatalogGiftTo = 'To: %s'
 CatalogGiftToggleOn = 'Stop Gifting'